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

Re: [PATCH] diff-cache/tree compatible output for show-diff (take 2).

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 27, 2005, 00:29 UTC
Message-ID
<Pine.LNX.4.58.0504261725470.18901@ppc970.osdl.org>
In-Reply-To
<Pine.LNX.4.58.0504261719230.18901@ppc970.osdl.org>
On Tue, 26 Apr 2005, Linus Torvalds wrote:
Show 5 quoted lines
>
> [ "U" for "unmerged" ]
> 
> Btw, diff-cache definitely _can_ output this form, so we probably should 
> make diff-cache do so too, to match, no?

Actually, we should decide on what diff-tree-helper does before that. Right now it always either calls out to the external diff program, or it says "cannot parse".

It's possible that an external "diff" program might actually want to know about unmerged files (maybe people don't actually do "diff", but something else altogether), so one approach might be to just make that an option.

The other approach is to just have something like "<pathname> is unmerged" as output from diff-tree-helper. That isn't quite as flexible, but it sure is simpler..

		Linus
Previous: Linus TorvaldsNext: Linus Torvalds
Message 21 of 22 in “Re: [GIT PATCH] Selective diff-tree”
  1. Linus TorvaldsApr 24, 2005
  2. David WoodhouseApr 24, 2005
  3. Linus TorvaldsApr 24, 2005
  4. Junio C HamanoApr 24, 2005
  5. Linus TorvaldsApr 24, 2005
  6. 0/2 diff-tree/diff-cache helperJunio C Hamano, Apr 25, 2005
  7. 1/2 Split external diff command interface to a separate file.Junio C Hamano, Apr 25, 2005
  8. 2/2 Introduce diff-tree-helper.Junio C Hamano, Apr 25, 2005
  9. Linus TorvaldsApr 26, 2005
  10. Nicolas PitreApr 26, 2005
  11. Junio C HamanoApr 26, 2005
  12. Diff-tree-helper take two.Junio C Hamano, Apr 26, 2005
  13. Add -r flag to show-diff for diff-cache/diff-tree like output.Junio C Hamano, Apr 26, 2005
  14. Linus TorvaldsApr 26, 2005
  15. Junio C HamanoApr 26, 2005
  16. Linus TorvaldsApr 26, 2005
  17. Junio C HamanoApr 27, 2005
  18. Linus TorvaldsApr 27, 2005
  19. diff-cache/tree compatible output for show-diff (take 2).Junio C Hamano, Apr 26, 2005
  20. Linus TorvaldsApr 27, 2005
  21. Linus TorvaldsApr 27, 2005
  22. Linus TorvaldsApr 27, 2005

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.