summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-14 14:25:46 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-14 14:25:46 -0800
commitb2e163272c01aca4aee4684f5c683ba341c1953d (patch)
tree34c715d4eae3110db63c6b9a2bbaa1c7abac4bdf
parent43f36901c5e4d54de2c3b7c5d62af59382df717c (diff)
parent9d87442f03c9e3fea7e24e2821fc0342f8efe1d6 (diff)
downloadgit-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
-rwxr-xr-xgit-commit.sh4
-rw-r--r--t/t7501-commit.sh10
2 files changed, 12 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." ;;
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 4dc35bdf55..9dba104b1f 100644
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -34,6 +34,16 @@ test_expect_failure \
"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"