X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-commit.sh;h=330a434b1891a67f78dfbb665558efef868bb704;hb=6c2711e70cc070559537a44f4975add451ee53f2;hp=d9ec1f14d9ec3336c4c772d0c03f30d5f1511d56;hpb=1c7fee5d0857d809fe5d93a1d56968e44296ce55;p=git.git

diff --git a/git-commit.sh b/git-commit.sh
index d9ec1f14..330a434b 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -609,7 +609,7 @@ fi
 	test -z "$only_include_assumed" || echo "$only_include_assumed"
 	run_status
 } >>"$GIT_DIR"/COMMIT_EDITMSG
-if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
+if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
 then
 	rm -f "$GIT_DIR/COMMIT_EDITMSG"
 	run_status