diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2010-09-07 21:33:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-08 08:53:54 -0700 |
| commit | 4ce6fb805803cd9bf82c08c84a2fdc8cd6bae8ef (patch) | |
| tree | f33d42bd81317d60c66ee24a57f71a74f56042b5 /builtin | |
| parent | 96ecac677aa84639a0b8e0aa0d781b197a2d16fe (diff) | |
| download | git-4ce6fb805803cd9bf82c08c84a2fdc8cd6bae8ef.tar.gz | |
fast-export: ensure that a renamed file is printed after all references
t9350 sets up a commit where a file is both copied and renamed. The output
of fast-export for this commit should look like this:
author ...
committer ...
from :19
C "file2" "file4"
R "file2" "file5"
The order of the two modification lines is derived from the result that
the diff machinery produces.
060df62 (fast-export: Fix output order of D/F changes) inserted a qsort
call that modifies the order of the diff result. Unfortunately, qsort need
not be stable. Therefore, it is possible that the 'R' line appears before
the 'C' line and the resulting fast-import stream is incorrect.
Fix it by forcing that the rename entry is printed after all other
modification lines with the same file name.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-export.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 965e90e5e8..007bba6795 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -166,7 +166,15 @@ static int depth_first(const void *a_, const void *b_) cmp = memcmp(name_a, name_b, len); if (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, |