From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ramana Kumar <ramana@member.fsf.org>, git@vger.kernel.org
Subject: Re: [PATCH 3/3] commit: give a hint when a commit message has been abandoned
Date: Mon, 23 Jul 2012 17:13:12 -0400 [thread overview]
Message-ID: <20120723211312.GA12533@sigill.intra.peff.net> (raw)
In-Reply-To: <7vr4s2jiqk.fsf@alter.siamese.dyndns.org>
On Mon, Jul 23, 2012 at 02:00:19PM -0700, Junio C Hamano wrote:
> >> Liberal use of atexit() for something like this makes me cringe
> >> somewhat.
> >
> > I don't like it either, but there's not really a better way. The die()
> > that Ramana triggered in the initial report is deep inside the ident
> > code. The only other option would be to hook into die_routine, which I
> > think is even uglier.
>
> Then I would rather not worry about it. A documentation update is
> probably a good first step, though.
I'm OK with dropping this one; the likely cause is ident problems, and
the previous patch already helped with that (the next likely is probably
commit hooks failing, but that is just a guess).
Here's a documentation patch.
-- >8 --
Subject: [PATCH] commit: document the temporary commit message file
We do not document COMMIT_EDITMSG at all, but users may want
to know about it for two reasons:
1. They may want to tell their editor to configure itself
for formatting a commit message.
2. If a commit is aborted by an error, the user may want
to recover the commit message they typed.
Let's put a note in git-commit(1).
---
Documentation/git-commit.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index f400835..87297dc 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -407,6 +407,15 @@ This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,
and `post-commit` hooks. See linkgit:githooks[5] for more
information.
+FILES
+-----
+
+`$GIT_DIR/COMMIT_EDITMSG`::
+ This file contains the commit message of a commit in progress.
+ If `git-commit` exits due to an error before creating a commit,
+ any commit message that has been provided by the user (e.g., in
+ an editor session) will be available in this file, but will be
+ overwritten by the next invocation of `git-commit`.
SEE ALSO
--------
next prev parent reply other threads:[~2012-07-23 21:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAMej=25=xj61pc+k42dv3byuBqUJzW21Sz+BXwoufqnKwV5Bbg@mail.gmail.com>
2012-07-21 14:26 ` empty ident name trashes commit message Ramana Kumar
2012-07-23 17:27 ` Jeff King
2012-07-23 18:05 ` Ramana Kumar
2012-07-23 18:46 ` Jeff King
2012-07-23 18:48 ` [PATCH 1/3] advice: pass varargs to strbuf_vaddf, not strbuf_addf Jeff King
2012-07-23 18:50 ` [PATCH 2/3] commit: check committer identity more strictly Jeff King
2012-07-23 20:51 ` Junio C Hamano
2012-07-23 20:53 ` Jeff King
2012-07-23 18:52 ` [PATCH 3/3] commit: give a hint when a commit message has been abandoned Jeff King
2012-07-23 20:49 ` Junio C Hamano
2012-07-23 20:52 ` Jeff King
2012-07-23 21:00 ` Junio C Hamano
2012-07-23 21:13 ` Jeff King [this message]
2012-07-23 21:35 ` Junio C Hamano
2012-07-23 21:43 ` Jeff King
2012-07-23 22:09 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120723211312.GA12533@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ramana@member.fsf.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.