summaryrefslogtreecommitdiff
path: root/show-diff.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-27 00:37:11 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-27 00:37:11 (GMT)
commitb8a55ce71d0d46204d64fe35787956e994d2a802 (patch)
treec43c0b013e372e640cef38bfaf7402c494d4d9b4 /show-diff.c
parent0a7668e99f513bd481ef6c4bc69995c434b91cb1 (diff)
downloadgit-b8a55ce71d0d46204d64fe35787956e994d2a802.zip
git-b8a55ce71d0d46204d64fe35787956e994d2a802.tar.gz
git-b8a55ce71d0d46204d64fe35787956e994d2a802.tar.bz2
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.
Diffstat (limited to 'show-diff.c')
-rw-r--r--show-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/show-diff.c b/show-diff.c
index a73e8e8..4557bd8 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))