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

diff --combined t/t7501-commit.sh
index b151b51a3420fdba921da16979ec4a480b61a973,7f25689bb7feec1a9611a27af5ee19f6211a9054..7f25689bb7feec1a9611a27af5ee19f6211a9054
mode 100755,100644..100755
--- 1/t/t7501-commit.sh
--- 2/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"