undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/d-f-conflict-fix'

Browse Source 
* en/d-f-conflict-fix:
  fast-export: ensure that a renamed file is printed after all references
This commit is contained in:
Junio C Hamano 2010-09-08 08:54:01 -07:00
commit 9f44723d1a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/fast-export.c
View File

@ -167,7 +167,15 @@ static int depth_first(const void *a_, const void *b_)
cmp = memcmp(name_a, name_b, len); cmp = memcmp(name_a, name_b, len);
if (cmp) if (cmp)
return cmp; return cmp;
return (len_b - len_a); cmp = len_b - len_a;
if (cmp)
return cmp;
/*
* Move 'R'ename entries last so that all references of the file
* appear in the output before it is renamed (e.g., when a file
* was copied and renamed in the same commit).
*/
return (a->status == 'R') - (b->status == 'R');
} }
static void show_filemodify(struct diff_queue_struct *q, static void show_filemodify(struct diff_queue_struct *q,