diff options
author | Elijah Newren <newren@gmail.com> | 2010-07-09 07:10:56 -0600 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-09 16:16:47 -0700 |
commit | 253fb5f8897d988d93ce276f8147c2964da3eefb (patch) | |
tree | 958e4640adb565f78bdae36af35b3c07956248d4 /t/t7104-reset.sh | |
parent | fast-export: Fix output order of D/F changes (diff) | |
download | tgif-253fb5f8897d988d93ce276f8147c2964da3eefb.tar.xz |
fast-import: Improve robustness when D->F changes provided in wrong order
When older versions of fast-export came across a directory changing to a
symlink (or regular file), it would output the changes in the form
M 120000 :239821 dir-changing-to-symlink
D dir-changing-to-symlink/filename1
When fast-import sees the first line, it deletes the directory named
dir-changing-to-symlink (and any files below it) and creates a symlink in
its place. When fast-import came across the second line, it was previously
trying to remove the file and relevant leading directories in
tree_content_remove(), and as a side effect it would delete the symlink
that was just created. This resulted in the symlink silently missing from
the resulting repository.
To improve robustness, we ignore file deletions underneath directory names
that correspond to non-directories. This can also be viewed as a minor
optimization: since there cannot be a file and a directory with the same
name in the same directory, the file clearly can't exist so nothing needs
to be done to delete it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7104-reset.sh')
0 files changed, 0 insertions, 0 deletions