git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re[2]: Possible bug: --ext-diff ignored with --cc in git log

From
VZVadim Zeitlin <vz-git@zeitlins.org>
Date
Mar 11, 2016, 02:04 UTC
Message-ID
<E1aeCRp-0005Jn-C1@smtp.tt-solutions.com>
In-Reply-To
<xmqqlh5qc698.fsf@gitster.mtv.corp.google.com>
On Thu, 10 Mar 2016 14:33:55 -0800 Junio C Hamano <gitster@pobox.com> wrote:

JCH> Vadim Zeitlin <vz-git@zeitlins.org> writes: JCH> JCH> > I.e. the JCH> > command "git log --ext-diff -p --cc" still outputs the real diff even for JCH> > the generated files, as if "--ext-diff" were not given. ... JCH> > Is the current behaviour intentional? I see it with all the git versions I JCH> > tried (1.7.10, 2.1.0, 2.7.0 and v2.8.0-rc1), but I don't really see why JCH> > would it need to work like this, so I hope it's an oversight and could be JCH> > corrected. JCH> JCH> I think this is "intentional" in the sense that "--cc" feature is JCH> fundamentally and conceptually incompatible with "--ext-diff".

 Thank you for your reply, Junio, I hadn't realized that --cc was dependent
on textual diff output format before, but now I understand why it can't
respect --ext-diff.

JCH> I haven't tried it myself, but if the contents you are using JCH> ext-diff on can be compared in a format that is easy-to-read for JCH> humans by passing them first to "textconv" filter and then running JCH> the normal "diff" on, that may be a viable approach to do what you JCH> are trying to do, as "textconv" feature is meant to still produce JCH> the output that still follows the usual "diff" convention. Its JCH> output should be usable by any tool (e.g. diffstat) meant to JCH> post-process patch output, and would be a better match for the JCH> "--cc" mechanism.

 I can't think of a way to make the output as concise as it is now (i.e.
just a single line saying that a generated file has been modified but the
changes to it are not being shown) with this approach.
 Maybe I'm clutching at straws here, but I wonder if it could be possible
to have a file attribute specifying whether --cc or -m should be used for
it when showing merges? Because this is, basically, what I want here: --cc
for normal files for readability but -m for the files I'm not interested
in. It's probably too specific to my particular hack^H^H^H^H use case to
add support for it to Git itself, but I wanted to mention it on a chance
that somebody else might think it's a good idea.
 Anyhow, thanks again for your explanation,
VZ
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 8 in “Possible bug: --ext-diff ignored with --cc in git log”
  1. Vadim ZeitlinMar 9, 2016
  2. Junio C HamanoMar 10, 2016
  3. Re[2]: Possible bug: --ext-diff ignored with --cc in git logVadim Zeitlin, Mar 11, 2016
  4. Junio C HamanoMar 11, 2016
  5. Jeff KingMar 11, 2016
  6. Junio C HamanoMar 11, 2016
  7. Jeff KingMar 11, 2016
  8. Re[2]: Possible bug: --ext-diff ignored with --cc in git logVadim Zeitlin, Mar 12, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.