From: Jeff King <peff@peff.net>
To: Aleksey Midenkov <midenok@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git diff: print hunk numbers?
Date: Wed, 8 Sep 2021 17:39:49 -0400 [thread overview]
Message-ID: <YTktpQ9uZkbwtuLO@coredump.intra.peff.net> (raw)
In-Reply-To: <CAF8BazDKG03bpBEQyC9EsM8WxV_7WnQ386T=VT49EHNzsZ3PPw@mail.gmail.com>
On Wed, Sep 08, 2021 at 11:40:20PM +0300, Aleksey Midenkov wrote:
> Is that possible/how to print hunk numbers with git diff?
>
> F.ex. instead of:
>
> @@ -106,7 +110,6 @@ while ($r < $statement_count)
> ...
>
> To print something like:
>
> @@ -106,7 +110,6 @@ 4 @@ while ($r < $statement_count)
> ...
>
> filterdiff uses hunk numbers intensively. Work with line-number ranges
> is not so effective.
No, Git doesn't know how to do any annotations on hunk lines (aside from
finding and reporting the funcname lines from the source). So you'd have
to post-process it, like:
git diff ... |
perl -pe 's/^@@.*?@@/join(" ", $&, ++$i, "@@")/e'
but I'm not sure if that's quite what you're after. If you're using
filterdiff to pick out hunks, then piping through "filterdiff
--annotate" does something similar.
If you want to post-process your diffs all the time, you can do
something like:
git config pager.color false
git config pager.diff 'filterdiff --annotate | less'
to show the annotations anytime the output is going to a terminal.
Though sadly filterdiff does not handle the colors; other
post-processors like diff-highlight parse around them.
And finally, if your ultimate goal is to use filterdiff to pick out
hunks, you might find using Git's picking tools like "checkout -p"
easier. Even if you are starting with an actual patch, you can apply it
and then pick out bits, like:
git checkout --detach ;# temporary head for applying patch
git apply </path/to/patch
git commit -m "temporary commit for patch"
git checkout - ;# back to the original branch
git checkout -p HEAD@{1} ;# now selectively grab parts
Of course that only helps if the patch actually applies. If your goal is
to filter out hunks that don't apply, it won't help. :)
-Peff
next prev parent reply other threads:[~2021-09-08 21:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 20:40 git diff: print hunk numbers? Aleksey Midenkov
2021-09-08 21:39 ` Jeff King [this message]
2021-09-08 22:02 ` Junio C Hamano
2021-09-09 15:45 ` Aleksey Midenkov
2021-09-09 21:31 ` Aleksey Midenkov
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YTktpQ9uZkbwtuLO@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=midenok@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).