diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:25:46 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:25:46 -0800 |
commit | b2e163272c01aca4aee4684f5c683ba341c1953d (patch) | |
tree | 34c715d4eae3110db63c6b9a2bbaa1c7abac4bdf /git-commit.sh | |
parent | 43f36901c5e4d54de2c3b7c5d62af59382df717c (diff) | |
parent | 9d87442f03c9e3fea7e24e2821fc0342f8efe1d6 (diff) | |
download | git-b2e163272c01aca4aee4684f5c683ba341c1953d.tar.gz |
Merge branch 'bs/maint-commit-options'
* bs/maint-commit-options:
git-commit: Add tests for invalid usage of -a/--interactive with paths
git-commit.sh: Fix usage checks regarding paths given when they do not make sense
Diffstat (limited to 'git-commit.sh')
-rwxr-xr-x | git-commit.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-commit.sh b/git-commit.sh index 6490045d30..959c4d68e7 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -282,9 +282,9 @@ unset only case "$all,$interactive,$also,$#" in *t,*t,*) die "Cannot use -a, --interactive or -i at the same time." ;; -t,,[1-9]*) +t,,,[1-9]*) die "Paths with -a does not make sense." ;; -,t,[1-9]*) +,t,,[1-9]*) die "Paths with --interactive does not make sense." ;; ,,t,0) die "No paths with -i does not make sense." ;; |