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

Re: [PATCH] Add -r flag to show-diff for diff-cache/diff-tree like output.

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 26, 2005, 22:40 UTC
Message-ID
<Pine.LNX.4.58.0504261534590.18901@ppc970.osdl.org>
In-Reply-To
<7vy8b5mawy.fsf_-_@assigned-by-dhcp.cox.net>
On Tue, 26 Apr 2005, Junio C Hamano wrote:
>
> This adds a new option -r (rational) to show-diff command, to
> produce diff-cache/diff-tree compatible output.

Why not just make this the default? Who really cares about show-diff? I see that "cg-merge" uses it, but does so with the "s" flag, just to see whether there are any changes at all.

So why not just make "rational" the standard format, and then make "diff-tree-helper" warn about unmerged ("U") files?

As far as I can tell, that is really what _everybody_ wants.

And calling "-r" "rational", when it means "recursive" for diff-tree and diff-cache doesn't sound rational to me. It _is_ rational to just silently accept it as "recursive", the same way diff-cache does.

		Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 14 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.