From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 01:54:08 +0000 (-0800)
Subject: Merge branch 'bs/maint-commit-options' into maint
X-Git-Tag: v1.5.3.7~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89919f4f57006358c278c1f207249edcccbe68c4?ds=inline;hp=-c

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
---

89919f4f57006358c278c1f207249edcccbe68c4
diff --combined t/t7501-commit.sh
index b151b51a34,7f25689bb7..7f25689bb7
mode 100755,100644..100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@@ -33,6 -33,16 +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"