diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 17:37:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 17:37:11 -0700 |
| commit | b8a55ce71d0d46204d64fe35787956e994d2a802 (patch) | |
| tree | c43c0b013e372e640cef38bfaf7402c494d4d9b4 | |
| parent | show-diff: match diff-tree and diff-cache output (diff) | |
| download | tgif-b8a55ce71d0d46204d64fe35787956e994d2a802.tar.xz | |
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.
| -rw-r--r-- | show-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/show-diff.c b/show-diff.c index a73e8e883e..4557bd82f3 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)) |