[PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit

[PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit

[Gerrit Pape]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 996 bytes --]

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>
---
 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

Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit

[Junio C Hamano]

Gerrit Pape <pape@smarden.org> 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.

Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit

[Junio C Hamano]

Gerrit Pape <pape@smarden.org> 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"?

Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit

[Gerrit Pape]

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.