diff options
| -rwxr-xr-x | git-commit.sh | 5 | ||||
| -rw-r--r-- | t/t7501-commit.sh | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/git-commit.sh b/git-commit.sh index 4290ae2dd..d7e7028c1 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -190,7 +190,6 @@ $1" ;; --a|--am|--ame|--amen|--amend) amend=t - log_given=t$log_given use_commit=HEAD shift ;; @@ -298,9 +297,9 @@ esac case "$log_given" in tt*) - die "Only one of -c/-C/-F/--amend can be used." ;; + die "Only one of -c/-C/-F can be used." ;; *tm*|*mt*) - die "Option -m cannot be combined with -c/-C/-F/--amend." ;; + die "Option -m cannot be combined with -c/-C/-F." ;; esac case "$#,$also,$only,$amend" in diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 8cc2cd9e6..6bd3c9e3e 100644 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -27,7 +27,7 @@ test_expect_success \ test_expect_failure \ "invalid options 1" \ - "git-commit --amend -F file" + "git-commit -m foo -m bar -F file" test_expect_failure \ "invalid options 2" \ @@ -78,9 +78,9 @@ test_expect_success \ "VISUAL=./editor git-commit --amend" test_expect_failure \ - "passing --amend and -F" \ + "passing -m and -F" \ "echo 'enough with the bongos' >file && \ - git-commit -F msg --amend ." + git-commit -F msg -m amending ." test_expect_success \ "using message from other commit" \ |