git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Santi Béjar" <santi@agolina.net>,
	"Git Mailing List" <git@vger.kernel.org>
Subject: Re: git commit -v does not removes the patch
Date: Sat, 22 Nov 2008 15:10:01 -0500	[thread overview]
Message-ID: <20081122201000.GA5903@sigill.intra.peff.net> (raw)
In-Reply-To: <20081122155541.GC6885@neumann>

On Sat, Nov 22, 2008 at 04:55:41PM +0100, SZEDER Gábor wrote:

> Thanks for the tip.  Junio's suggestion about '# Everything under this
> line is deleted.' could be implemented this way fairly easily (just an
> additional echo in prepare-commit-msg, and other pattern in
> commit-msg).  But 'git commit --no-verify' is indeed a problem.
> Although I never use it explicitly, 'git rebase -i' does so.

One other option would be to munge the editor script instead of using
hooks. I.e., something like this:

  $ cat ~/local/bin/git-editor
  #!/bin/sh
  echo '# Everything under this line is deleted' >>"$1"
  git diff --cached >>"$1"
  $EDITOR "$1" || exit $?
  sed -i '/^# Everything under this line is deleted$/Q' "$1"

  $ git config core.editor ~/local/bin/git-editor

Of course, then you end up with the munging for things like "git rebase
-i" picking commits, but it should be harmless (since we end up removing
it anyway).

-Peff

  reply	other threads:[~2008-11-22 20:11 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
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 [this message]
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=20081122201000.GA5903@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=santi@agolina.net \
    --cc=szeder@ira.uka.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).