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 <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Gerrit Pape committed
Feb 8, 2008 at 09:53 UTC
5a95b85566b1700e042fdce6ec2de9ce7b5a8787
1 file changed
+1
builtin-commit.c
+1
@@ -929,6 +929,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
929
930
unlink(git_path("MERGE_HEAD"));
931
unlink(git_path("MERGE_MSG"));
932
+ unlink(git_path("SQUASH_MSG"));
933
934
if (commit_index_files())
935
die ("Repository has been updated, but unable to write\n"