diff options
| author | Elijah Newren <newren@gmail.com> | 2010-07-09 07:10:55 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-09 16:16:29 -0700 |
| commit | 060df624228187c77ca53a437ae0e9896076f045 (patch) | |
| tree | d95230936ae0662e6987e03e591ee43fb83d0caf /t/t9350-fast-export.sh | |
| parent | 5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9 (diff) | |
| download | git-060df624228187c77ca53a437ae0e9896076f045.tar.gz git-060df624228187c77ca53a437ae0e9896076f045.tar.xz | |
fast-export: Fix output order of D/F changes
The fast-import stream format requires incremental changes which take place
immediately, meaning that for D->F conversions all files below the relevant
directory must be deleted before the resulting file of the same name is
created. Reversing the order can result in fast-import silently deleting
the file right after creating it, resulting in the file missing from the
resulting repository.
We correct this by first sorting the diff_queue_struct in depth-first
order.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9350-fast-export.sh')
| -rwxr-xr-x | t/t9350-fast-export.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index 69179c612..1ee1461c9 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -376,7 +376,7 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag' test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' -test_expect_failure 'directory becomes symlink' ' +test_expect_success 'directory becomes symlink' ' git init dirtosymlink && git init result && ( |