Commit 89919f4f authored by Junio C Hamano's avatar Junio C Hamano

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
parents 7a3db75b 9d87442f
......@@ -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." ;;
......
......@@ -33,6 +33,16 @@ test_expect_failure \
"invalid options 2" \
"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 \
"using invalid commit with -C" \
"git-commit -C bogus"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment