threads / patch / 11965

patchbuiltin-commit: remove .git/SQUASH_MSG upon successful commit

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

## tl;dr

4 messages between Feb 8, 2008 and Feb 11, 2008. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Gerrit Pape· Feb 8, 2008, 09:53 UTC · lore

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(-)
Show changes to builtin-commit.c +1 −0
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· Feb 8, 2008, 10:03 UTC · re: Gerrit Pape · lore

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

Gerrit Pape <pape@smarden.org> writes:
Show 5 quoted lines
> 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· Feb 10, 2008, 07:25 UTC · re: Gerrit Pape · lore

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

Gerrit Pape <pape@smarden.org> writes:
Show 5 quoted lines
> 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· Feb 11, 2008, 10:29 UTC · re: Junio C Hamano · lore

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

On Sat, Feb 09, 2008 at 11:25:51PM -0800, Junio C Hamano wrote:
Show 11 quoted lines
> 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.

← back to recent threads