diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2006-02-18 03:49:38 -0800 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-02-18 11:21:16 -0800 |
| commit | 3ff903bfb9e34a02f681f1c95ef7aa3ce4d54d2a (patch) | |
| tree | 2f20a5531ee64dd9ac94920536ce3f71121c2a85 /t/t3101-ls-tree-dirname.sh | |
| parent | Make git-reset delete empty directories (diff) | |
| download | tgif-3ff903bfb9e34a02f681f1c95ef7aa3ce4d54d2a.tar.xz | |
archimport: remove files from the index before adding/updating
This fixes a bug when importing where a directory gets removed/renamed
but is immediately replaced by a file of the same name in the same
changeset.
This fix only applies to the accurate (default) strategy the moment.
This patch should also fix the fast strategy if/when it is updated
to handle the cases that would've triggered this bug.
This bug was originally found in git-svn, but I remembered I did the
same thing with archimport as well.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3101-ls-tree-dirname.sh')
0 files changed, 0 insertions, 0 deletions