From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 27 Apr 2005 00:37:11 +0000 (-0700)
Subject: show-diff: don't print out the full "ce" format for unmerged files
X-Git-Tag: v0.99~734
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8a55ce71d0d46204d64fe35787956e994d2a802;p=git.git

show-diff: don't print out the full "ce" format for unmerged files

It really doesn't make sense, since there are potentially _many_ different
cache entries for an unmerged file. So just do the "U pathname" thing.
---

diff --git a/show-diff.c b/show-diff.c
index a73e8e883..4557bd82f 100644
--- a/show-diff.c
+++ b/show-diff.c
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 			continue;
 
 		if (ce_stage(ce)) {
-			show_file("U", ce);
+			printf("U %s%c", ce->name, line_termination);
 
 			while (i < entries &&
 			       !strcmp(ce->name, active_cache[i]->name))