global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 22:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jh/dirstat' into next

Browse Source 
* jh/dirstat:
  --dirstat: In case of renames, use target filename instead of source filename
This commit is contained in:
Junio C Hamano
2011-04-12 13:50:39 -07:00
parent a94aa85224 2ca8671470
commit dd2c308845
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@@ -1543,7 +1543,7 @@ static void show_dirstat(struct diff_options *options)
unsigned long copied, added, damage;
int content_changed;
name = p->one->path ? p->one->path : p->two->path;
name = p->two->path ? p->two->path : p->one->path;
if (p->one->sha1_valid && p->two->sha1_valid)
content_changed = hashcmp(p->one->sha1, p->two->sha1);