diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-24 17:54:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-24 17:54:08 -0800 |
| commit | 89919f4f57006358c278c1f207249edcccbe68c4 (patch) | |
| tree | 0216e61b7a06eade9c50c7a5b5bb59609baa12aa /git-commit.sh | |
| parent | Fix sample pre-commit hook (diff) | |
| parent | git-commit: Add tests for invalid usage of -a/--interactive with paths (diff) | |
| download | git-89919f4f57006358c278c1f207249edcccbe68c4.tar.gz git-89919f4f57006358c278c1f207249edcccbe68c4.zip | |
Merge branch 'bs/maint-commit-options' into maint
* 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 ab43217be4..5e3908f2cb 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -322,9 +322,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." ;; |