From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Vadim Zeitlin <vz-git@zeitlins.org>, git@vger.kernel.org
Subject: Re: Possible bug: --ext-diff ignored with --cc in git log
Date: Fri, 11 Mar 2016 14:45:18 -0500 [thread overview]
Message-ID: <20160311194518.GA1269@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqr3fgal3j.fsf@gitster.mtv.corp.google.com>
On Fri, Mar 11, 2016 at 11:08:32AM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> >> It happens that the above is fairly easily doable with today's Git
> >> without any modification. Here is how.
> >> [...]
> >
> > I think an even easier way is:
> >
> > git log --cc --raw
> >
> > I know that is somewhat beside the point you are making, which is how we
> > should handle "--cc" with ext-diff. But I would much rather have us
> > show nothing for that case, and let the user turn on "--raw", than to
> > invent a diff-looking format that does not actually represent the file
> > contents.
>
> Sorry, but I am not sure where you are trying to go with this.
>
> I understand that the original issue was that Vadim wants to
> suppress reams of differences for _some_ paths but still wants to
> benefit from the textual summarized diff for all the other paths.
> Giving "--raw" would be global, and would affect other paths, no?
Ah, sorry, I thought the problem was the opposite: that there was no
output for ext-diff paths, and we needed to add something back in. Doing
"--raw" is a much easier way than textconv of the "add back in" part,
but it does not suppress the ordinary combined diff.
-Peff
next prev parent reply other threads:[~2016-03-11 19:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 17:43 Possible bug: --ext-diff ignored with --cc in git log Vadim Zeitlin
2016-03-10 22:33 ` Junio C Hamano
2016-03-11 2:04 ` Re[2]: " Vadim Zeitlin
2016-03-11 18:20 ` Junio C Hamano
2016-03-11 18:58 ` Jeff King
2016-03-11 19:08 ` Junio C Hamano
2016-03-11 19:45 ` Jeff King [this message]
2016-03-12 1:08 ` Re[2]: " Vadim Zeitlin
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=20160311194518.GA1269@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vz-git@zeitlins.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).