author | Steven Walter <stevenrwalter@gmail.com> | |
Mon, 20 Feb 2012 14:17:54 +0000 (09:17 -0500) | ||
committer | Eric Wong <normalperson@yhbt.net> | |
Tue, 21 Feb 2012 21:37:31 +0000 (21:37 +0000) | ||
commit | 379862ec5a413e636d977a6ea3d618f0b3eafceb | |
tree | 090daa36792fd9af62b2ac6ead8ce13b370d8821 | tree | snapshot |
parent | 5ec514bd2f9b18463886df372ea1412fc61467de | commit | diff |
git-svn.perl: fix a false-positive in the "already exists" test
open_or_add_dir checks to see if the directory already exists or not.
If it already exists and is not a directory, then we fail. However,
open_or_add_dir did not previously account for the possibility that the
path did exist as a file, but is deleted in the current commit.
In order to prevent this legitimate case from failing, open_or_add_dir
needs to know what files are deleted in the current commit.
Unfortunately that information has to be plumbed through a couple of
layers.
Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
open_or_add_dir checks to see if the directory already exists or not.
If it already exists and is not a directory, then we fail. However,
open_or_add_dir did not previously account for the possibility that the
path did exist as a file, but is deleted in the current commit.
In order to prevent this legitimate case from failing, open_or_add_dir
needs to know what files are deleted in the current commit.
Unfortunately that information has to be plumbed through a couple of
layers.
Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
git-svn.perl | diff | blob | history | |
t/t9100-git-svn-basic.sh | diff | blob | history |