undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bs/maint-commit-options'

Browse Source 
* 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
commit b2e163272c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-commit.sh
View File

@ -282,9 +282,9 @@ unset only
case "$all,$interactive,$also,$#" in case "$all,$interactive,$also,$#" in
*t,*t,*) *t,*t,*)
die "Cannot use -a, --interactive or -i at the same time." ;; 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." ;; die "Paths with -a does not make sense." ;;
,t,[1-9]*) ,t,,[1-9]*)
die "Paths with --interactive does not make sense." ;; die "Paths with --interactive does not make sense." ;;
,,t,0) ,,t,0)
die "No paths with -i does not make sense." ;; die "No paths with -i does not make sense." ;;

10
t/t7501-commit.sh
View File

@ -33,6 +33,16 @@ test_expect_failure \
"invalid options 2" \ "invalid options 2" \
"git-commit -C HEAD -m illegal" "git-commit -C HEAD -m illegal"
test_expect_failure \
"using paths with -a" \
"echo King of the bongo >file &&
git-commit -m foo -a file"
test_expect_failure \
"using paths with --interactive" \
"echo bong-o-bong >file &&
echo 7 | git-commit -m foo --interactive file"
test_expect_failure \ test_expect_failure \
"using invalid commit with -C" \ "using invalid commit with -C" \
"git-commit -C bogus" "git-commit -C bogus"