From 13aba1e514c1dceee9d731d157bbc261426be351 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 3 Dec 2007 08:24:50 +0100 Subject: git-commit: Allow to amend a merge commit that does not change the tree Normally, it should not be allowed to generate an empty commit. A merge commit generated with git 'merge -s ours' does not change the tree (along the first parent), but merges are not "empty" even if they do not change the tree. Hence, commit 8588452ceb7 allowed to amend a merge commit that does not change the tree, but 4fb5fd5d301 disallowed it again in an attempt to avoid that an existing commit is amended such that it becomes empty. With this change, a commit can be edited (create a new one or amend an existing one) either if there are changes or if there are at least two parents. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- git-commit.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'git-commit.sh') diff --git a/git-commit.sh b/git-commit.sh index 485339754c..cef76a7775 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -515,13 +515,16 @@ else # we need to check if there is anything to commit run_status >/dev/null fi -if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ] -then +case "$?,$PARENTS" in +0,* | *,-p' '?*-p' '?*) + # a merge commit can record the same tree as its parent. + ;; +*) rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG" use_status_color=t run_status exit 1 -fi +esac case "$no_edit" in '') -- cgit v1.3