From: Gerrit Pape Date: Fri, 8 Feb 2008 09:53:58 +0000 (+0000) Subject: builtin-commit: remove .git/SQUASH_MSG upon successful commit X-Git-Tag: v1.5.4.2~56 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a95b85566b1700e042fdce6ec2de9ce7b5a8787;p=git.git builtin-commit: remove .git/SQUASH_MSG upon successful commit After doing a merge --squash, and commit afterwards, the commit message template SQUASH_MSG in the git directory is not removed, which means that the content of SQUASH_MSG is used as default commit message for all subsequent commits. So have git commit remove the file SQUASH_MSG from the git directory upon a successful commit. The problem was discovered by Frédéric Brière, reported through http://bugs.debian.org/464656 Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano --- diff --git a/builtin-commit.c b/builtin-commit.c index c787bed69..3a47275b8 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -929,6 +929,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) unlink(git_path("MERGE_HEAD")); unlink(git_path("MERGE_MSG")); + unlink(git_path("SQUASH_MSG")); if (commit_index_files()) die ("Repository has been updated, but unable to write\n"