From b8a55ce71d0d46204d64fe35787956e994d2a802 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 26 Apr 2005 17:37:11 -0700 Subject: [PATCH] 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. --- show-diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.30.2