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 <johannes.sixt@xxxxxxxxxx> --- I need this patch because I sometimes do 'git merge -s ours' and then want to change the commit message. I haven't gotten around to write a test case for this scenario, so I'm sending out the fix alone, in order to draw attention to the issue and have builtin-commit fixed by its authors, if necessary ;) Thanks, -- Hannes git-commit.sh | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git-commit.sh b/git-commit.sh index 4853397..1a07278 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*) + : # ok, go ahead + ;; +*) rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG" use_status_color=t run_status exit 1 -fi +esac case "$no_edit" in '') -- 1.5.3.6.969.g3cdf46 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
