Re: [PATCH] Add -r flag to show-diff for diff-cache/diff-tree like output.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Apr 27, 2005, 00:05 UTC
- Message-ID
- <7vd5shkrs5.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <Pine.LNX.4.58.0504261639420.18901@ppc970.osdl.org>
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:
>> Later I'll add -p flag to diff-cache and diff-tree, so the usage >> of these three commands match.
LT> The thing is, "-p" is strictly weaker than doing the UNIX LT> pipe way, since the latter trivially does the same time (add LT> a simple script if you don't want to type it), but can also LT> do things like "grep the filenames going past" or similar.
I do not disagree with that. Having only "-p" and not having diff-cache/tree output _is_ weaker, and I am _not_ advocating for removing the diff-cache/tree like output format from these three commands.
What I _am_ advocating for is to obsolete the diff-tree-helper program. What it does can be done, with the diff.[ch] change you merged this morning, without going through a pipe to the diff-tree-helper process but directly from these three commands, once diff-cache/tree acquires the "-p" flag.
By the way, how about renaming show-diff to diff-file?
diff-tree : compares two trees.
diff-cache : compares a tree and the cache, or a tree and files.
diff-file : compares the cache and files.