All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Santi Béjar" <santi@agolina.net>,
	"Git Mailing List" <git@vger.kernel.org>
Subject: Re: git commit -v does not removes the patch
Date: Tue, 11 Nov 2008 09:13:18 -0800	[thread overview]
Message-ID: <7v4p2e2nkg.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20081111102914.GA30330@coredump.intra.peff.net> (Jeff King's message of "Tue, 11 Nov 2008 05:29:15 -0500")

Jeff King <peff@peff.net> writes:

> But I have to wonder if there is some more robust solution. It seems
> like this can have false positives if you include diff output in your
> commit message, and a potential false negative if you delete the newline
> (e.g., delete everything up to "diff --git", making it the first line).

Actually, I recall (from my googling quite some time ago) people noticing
this, but they learnt to live with it.

We may want to change this.  We can say "# Everything under this line is
deleted." at the beginning of the "#" block we produce in the commit log
message editor, replacing the "Lines starting with '#' will be ignored, "
we currently have.  When reading back the editor result, make "git commit
-v" scan for the "# Everything ..." line.  We remove it and everything
that follows, but we do not touch anything above that line (including the
ones that begin with "diff" or "#") except the usual trailing whitespace
removal.  That way, people can leave a sample shell session with root
prompt, and sample diff, in their message.

If we do not see "# Everything ..." when we read it back, we can do what
we currently do as a fallback.

  parent reply	other threads:[~2008-11-11 17:15 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-10 15:20 git commit -v does not removes the patch Santi Béjar
2008-11-10 18:10 ` Jeff King
2008-11-10 22:34   ` Santi Béjar
2008-11-10 23:27     ` Junio C Hamano
2008-11-11  0:07       ` Jeff King
2008-11-11  7:56         ` Santi Béjar
2008-11-11 10:29           ` Jeff King
2008-11-11 11:20             ` Santi Béjar
2008-11-11 17:13             ` Junio C Hamano [this message]
2008-11-12  8:16               ` Jeff King
2008-11-12  8:17                 ` [PATCH 1/5] define empty tree sha1 as a macro Jeff King
2008-11-12  8:21                 ` [PATCH 2/5] wt-status: refactor initial commit printing Jeff King
2008-11-12  8:23                 ` [PATCH 3/5] status: show "-v" diff even for initial commit Jeff King
2008-11-12  8:24                 ` [PATCH 4/5] commit: loosen pattern for matching "-v" diff Jeff King
2008-11-12  8:25                 ` [PATCH 5/5] commit: only strip diff from message in verbose mode Jeff King
2008-11-12  8:29                   ` Jeff King
2008-11-13  2:15                 ` git commit -v does not removes the patch Junio C Hamano
2008-11-20 13:09                 ` SZEDER Gábor
2008-11-20 15:20                   ` Jeff King
2008-11-22 15:55                     ` SZEDER Gábor
2008-11-22 20:10                       ` Jeff King
2008-11-22 22:43                       ` 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=7v4p2e2nkg.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=santi@agolina.net \
    /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.