{"thread":{"id":"11965","subject":"[PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit","startedAt":"2008-02-08T09:53:58Z","lastAt":"2008-02-11T10:29:52Z","messageCount":4,"participants":["Gerrit Pape","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"67917","messageId":"20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org","threadId":"11965","inReplyTo":null,"subject":"[PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2008-02-08T09:53:58Z","receivedAt":"2008-02-08T09:53:58Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"After doing a merge --squash, and commit afterwards, the commit message\ntemplate SQUASH_MSG in the git directory is not removed, which means that\nthe content of SQUASH_MSG is used as default commit message for all\nsubsequent commits.  So have git commit remove the file SQUASH_MSG from\nthe git directory upon a successful commit.\n\nThe problem was discovered by Fr�d�ric Bri�re, reported through\n http://bugs.debian.org/464656\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n---\n builtin-commit.c |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/builtin-commit.c b/builtin-commit.c\nindex c787bed..3a47275 100644\n--- a/builtin-commit.c\n+++ b/builtin-commit.c\n@@ -929,6 +929,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)\n \n \tunlink(git_path(\"MERGE_HEAD\"));\n \tunlink(git_path(\"MERGE_MSG\"));\n+\tunlink(git_path(\"SQUASH_MSG\"));\n \n \tif (commit_index_files())\n \t\tdie (\"Repository has been updated, but unable to write\\n\"\n-- \n1.5.4\n"},{"id":"67921","messageId":"7vsl03kbof.fsf@gitster.siamese.dyndns.org","threadId":"11965","inReplyTo":"20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org","subject":"Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-08T10:03:12Z","receivedAt":"2008-02-08T10:03:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Gerrit Pape <pape@smarden.org> writes:\n\n> After doing a merge --squash, and commit afterwards, the commit message\n> template SQUASH_MSG in the git directory is not removed, which means that\n> the content of SQUASH_MSG is used as default commit message for all\n> subsequent commits.  So have git commit remove the file SQUASH_MSG from\n> the git directory upon a successful commit.\n\nIt appears that there are a few more differences from what\ncontrib/examples/git-commit.sh used to do.  For example, the\nCOMMIT_EDITMSG file used to be removed at around the same place\nas the SQUASH_MSG file.\n"},{"id":"68180","messageId":"7v4pch2ry8.fsf@gitster.siamese.dyndns.org","threadId":"11965","inReplyTo":"20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org","subject":"Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-10T07:25:51Z","receivedAt":"2008-02-10T07:25:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Gerrit Pape <pape@smarden.org> writes:\n\n> After doing a merge --squash, and commit afterwards, the commit message\n> template SQUASH_MSG in the git directory is not removed, which means that\n> the content of SQUASH_MSG is used as default commit message for all\n> subsequent commits.  So have git commit remove the file SQUASH_MSG from\n> the git directory upon a successful commit.\n\nAs your message was marked with\n\n        MIME-Version: 1.0\n        Content-Type: text/plain; charset=unknown-8bit\n\nI am getting this, which would most likely to be wrong rendition\nof Fr???ic's name.\n\n> The problem was discovered by Fr馘駻ic Bri鑽e, reported through\n\nIs the name \"Frédéric Brière\"?\n"},{"id":"68366","messageId":"20080211102952.11456.qmail@d2fd415933607e.315fe32.mid.smarden.org","threadId":"11965","inReplyTo":"7v4pch2ry8.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2008-02-11T10:29:52Z","receivedAt":"2008-02-11T10:29:52Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"On Sat, Feb 09, 2008 at 11:25:51PM -0800, Junio C Hamano wrote:\n> As your message was marked with\n> \n>         MIME-Version: 1.0\n>         Content-Type: text/plain; charset=unknown-8bit\n> \n> I am getting this, which would most likely to be wrong rendition\n> of Fr???ic's name.\n> \n> > The problem was discovered by Fr馘駻ic Bri鑽e, reported through\n> \n> Is the name \"Frédéric Brière\"?\n\nSorry.  Yes, it's \"Frédéric Brière\" ;).\n\nRegards, Gerrit.\n"}]}