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
This commit is contained in:
Junio C Hamano
2007-11-14 14:25:46 -08:00
2 changed files with 12 additions and 2 deletions

View File

@@ -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." ;;