development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Linus Torvalds 2005-04-26 17:37:11 -07:00
parent 0a7668e99f
commit b8a55ce71d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
show-diff.c
View file

@ -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))