# [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit 4 messages from 2008-02-08 to 2008-02-11. Participants: Gerrit Pape, Junio C Hamano. Thread: https://gitlist.dev/t/11965 ## Gerrit Pape, 2008-02-08 09:53 Subject: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit Message-ID: <20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20080208095358.25666.qmail%40b4daf7aef4dba9.315fe32.mid.smarden.org ``` 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 --- builtin-commit.c | 1 + 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" -- 1.5.4 ``` ## Junio C Hamano, 2008-02-08 10:03 Subject: Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit Message-ID: <7vsl03kbof.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vsl03kbof.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org> ``` Gerrit Pape writes: > 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. It appears that there are a few more differences from what contrib/examples/git-commit.sh used to do. For example, the COMMIT_EDITMSG file used to be removed at around the same place as the SQUASH_MSG file. ``` ## Junio C Hamano, 2008-02-10 07:25 Subject: Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit Message-ID: <7v4pch2ry8.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4pch2ry8.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org> ``` Gerrit Pape writes: > 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. As your message was marked with MIME-Version: 1.0 Content-Type: text/plain; charset=unknown-8bit I am getting this, which would most likely to be wrong rendition of Fr???ic's name. > The problem was discovered by Fr馘駻ic Bri鑽e, reported through Is the name "Frédéric Brière"? ``` ## Gerrit Pape, 2008-02-11 10:29 Subject: Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit Message-ID: <20080211102952.11456.qmail@d2fd415933607e.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20080211102952.11456.qmail%40d2fd415933607e.315fe32.mid.smarden.org In-Reply-To: <7v4pch2ry8.fsf@gitster.siamese.dyndns.org> ``` On Sat, Feb 09, 2008 at 11:25:51PM -0800, Junio C Hamano wrote: > As your message was marked with > > MIME-Version: 1.0 > Content-Type: text/plain; charset=unknown-8bit > > I am getting this, which would most likely to be wrong rendition > of Fr???ic's name. > > > The problem was discovered by Fr馘駻ic Bri鑽e, reported through > > Is the name "Frédéric Brière"? Sorry. Yes, it's "Frédéric Brière" ;). Regards, Gerrit. ```