summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2008-02-08 09:53:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-11 20:24:27 (GMT)
commit5a95b85566b1700e042fdce6ec2de9ce7b5a8787 (patch)
tree77c56b5fa4ef37424dd20a83e9ff8ecb2eb498e3
parent8464010f974245b1e392d34ddbfb914fcf3d8c23 (diff)
downloadgit-5a95b85566b1700e042fdce6ec2de9ce7b5a8787.zip
git-5a95b85566b1700e042fdce6ec2de9ce7b5a8787.tar.gz
git-5a95b85566b1700e042fdce6ec2de9ce7b5a8787.tar.bz2
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>
-rw-r--r--builtin-commit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index c787bed..3a47275 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"