![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Gerrit Pape <pape@smarden.org> | |
| Fri, 8 Feb 2008 09:53:58 +0000 (09:53 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Feb 2008 20:24:27 +0000 (12:24 -0800) | ||
| commit | 5a95b85566b1700e042fdce6ec2de9ce7b5a8787 | |
| tree | 77c56b5fa4ef37424dd20a83e9ff8ecb2eb498e3 | tree | snapshot |
| parent | 8464010f974245b1e392d34ddbfb914fcf3d8c23 | commit | diff |
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>
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>
| builtin-commit.c | diff | blob | history |