git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.

[jc: adjusted t/t7501 as this makes -F and --amend compatible]
Signed-off-by: NDavid Kastrup <dak@gnu.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

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

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