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

Re: [RFC/PATCH 2/2] WIP xdiff: markup duplicates differently

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 4, 2016, 06:48 UTC
Message-ID
<xmqqlgz8qhxa.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<eb88af2c-d7b1-295e-5f23-a85045bde753@gmail.com>
Jakub Narębski <jnareb@gmail.com> writes:
> Side note: I wonder if the cousin of unified diff, namely context diff[1],
> is something that we can and should support.

Yes, the lack of support for the copied context (instead of the unified context) diff format has bugged me over the years. Reading copied context diff format however is rapidly becoming a lost art, unfortunately, partly due to our popularity, and the need for the format has become a lessor issue.

I wonder if a pair of a pre-processor (on the input side, before running 'git apply') and a post-processor (on the output side, munging the output from 'git show/diff') would be sufficient.

In any case, I agree with you that it has nothing to do with what Stefan is doing here.

Previous: Jakub NarębskiNext: Junio C Hamano
Message 7 of 13 in “Color moved code differently”
  1. 0/2 Color moved code differentlyStefan Beller, Sep 3, 2016
  2. 1/2 diff.c: emit duplicate lines with a different colorStefan Beller, Sep 3, 2016
  3. 2/2 WIP xdiff: markup duplicates differentlyStefan Beller, Sep 3, 2016
  4. Jakub NarębskiSep 3, 2016
  5. Stefan BellerSep 4, 2016
  6. Jakub NarębskiSep 4, 2016
  7. Junio C HamanoSep 4, 2016
  8. Junio C HamanoSep 3, 2016
  9. Stefan BellerSep 4, 2016
  10. Junio C HamanoSep 4, 2016
  11. Stefan BellerSep 4, 2016
  12. Junio C HamanoSep 4, 2016
  13. Jacob KellerSep 4, 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.