From: Junio C Hamano <junkio@cox.net>
Date: Sun, 5 Mar 2006 04:36:28 +0000 (-0800)
Subject: git-commit --amend: allow empty commit.
X-Git-Tag: v1.3.0-rc1~43^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8588452ceb7;p=git.git

git-commit --amend: allow empty commit.

When amending a commit only to update the commit log message, git-status
would rightly say "Nothing to commit."  Do not let this prevent commit to
be made.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-commit.sh b/git-commit.sh
index d9ec1f14d..330a434b1 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