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