Skip to content

Commit

Permalink
show-diff: don't print out the full "ce" format for unmerged files
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Linus Torvalds committed Apr 27, 2005
1 parent 0a7668e commit b8a55ce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion show-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit b8a55ce

Please sign in to comment.