git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Don Zickus" <dzickus@gmail.com>
To: "Linus Torvalds" <torvalds@linux-foundation.org>
Cc: "Junio C Hamano" <junkio@cox.net>,
	"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Fix "git log -z" behaviour
Date: Wed, 7 Feb 2007 17:53:22 -0500	[thread overview]
Message-ID: <68948ca0702071453i3c4d1b66hcf173fc17919acd6@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0702071139090.8424@woody.linux-foundation.org>

>
> For commit messages, we should really put the "line_termination" when we
> output the character in between different commits, *not* between the
> commit and the diff. The diff goes hand-in-hand with the commit, it
> shouldn't be separated from it with the termination character.
>
> So this:
>  - uses the termination character for true inter-commit spacing
>  - uses a regular newline between the commit log and the diff
>
> We had it the other way around.
>
> For the normal case where the termination character is '\n', this
> obviously doesn't change anything at all, since we just switched two
> identical characters around. So it's very safe - it doesn't change any
> normal usage, but it definitely fixes "git log -z".
>
> By fixing "git log -z", you can now also do insane things like
>
>         git log -p -z |
>                 grep -z "some patch expression" |
>                 tr '\0' '\n' |
>                 less -S
>
> and you will see only those commits that have the "some patch expression"
> in their commit message _or_ their patches.
>
> (This is slightly different from 'git log -S"some patch expression"',
> since the latter requires the expression to literally *change* in the
> patch, while the "git log -p -z | grep .." approach will see it if it's
> just an unchanged _part_ of the patch context)
>
> Of course, if you actually do something like the above, you're probably
> insane, but hey, it works!
>
> Try the above command line for a demonstration (of course, you need to
> change the "some patch expression" to be something relevant). The old
> behaviour of "git log -p -z" was useless (and got things completely wrong
> for log entries without patches).
>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> ---
>
> On Wed, 7 Feb 2007, Linus Torvalds wrote:
> >
> > Also, I just checked, and we have a bug. Merges do not have the ending
> > zero in "git log -z" output. It seems to be connected to the fact that we
> > handle the "always_show_header" commits differently (the ones that we
> > wouldn't normally show because they have no diffs associated with them).
> >
> > The obvious fix for that failed. I'll look at it some more.
>
> Actually, the obvious fix was right, I just did the *wrong* obvious fix at
> first ;)

Works for me.  :)
And I thought I had a handle on a lot of the Unix commands.  That -z
stuff just threw me for a loop.  It's pretty neat to be able to grep
commits and have the output display the whole commit and diff.

Cheers,
Don

  parent reply	other threads:[~2007-02-07 22:53 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-07 16:41 git log filtering Don Zickus
2007-02-07 16:55 ` Jakub Narebski
2007-02-07 17:01 ` Uwe Kleine-König
2007-02-07 17:12   ` Johannes Schindelin
2007-02-07 17:12 ` Linus Torvalds
2007-02-07 17:25   ` Johannes Schindelin
     [not found]     ` <7v64ad7l12.fsf@assigned-by-dhcp.cox.net>
2007-02-07 21:03       ` Linus Torvalds
2007-02-07 21:09         ` Junio C Hamano
2007-02-07 21:53           ` Linus Torvalds
2007-02-08  6:16             ` Jeff King
2007-02-08 18:06               ` Johannes Schindelin
2007-02-08 22:33                 ` Jeff King
2007-02-09  0:18                   ` Johannes Schindelin
2007-02-09  0:23                     ` Shawn O. Pearce
2007-02-09  0:45                       ` Johannes Schindelin
2007-02-09 10:15                       ` Sergey Vlasov
2007-02-09  1:59                     ` Jeff King
2007-02-09 13:13                       ` Johannes Schindelin
2007-02-09 13:22                         ` Jeff King
2007-02-09 15:02                           ` Johannes Schindelin
2007-03-07 17:37               ` pcre performance, was " Johannes Schindelin
2007-03-07 18:03                 ` Paolo Bonzini
2007-02-08  1:59         ` Horst H. von Brand
2007-02-07 18:16   ` Linus Torvalds
2007-02-07 19:49     ` Fix "git log -z" behaviour Linus Torvalds
2007-02-07 19:55       ` Junio C Hamano
2007-02-07 22:53       ` Don Zickus [this message]
2007-02-07 23:05         ` Linus Torvalds
2007-02-08 22:34       ` Junio C Hamano
2007-02-10  7:32         ` Junio C Hamano
2007-02-10  9:36           ` Junio C Hamano
2007-02-10 17:09             ` Linus Torvalds
2007-02-07 18:19   ` git log filtering Don Zickus
2007-02-07 18:27     ` Linus Torvalds

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=68948ca0702071453i3c4d1b66hcf173fc17919acd6@mail.gmail.com \
    --to=dzickus@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=torvalds@linux-foundation.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 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).