diff options
author | Steven Walter <stevenrwalter@gmail.com> | 2012-02-20 09:17:54 -0500 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2012-02-21 21:37:31 +0000 |
commit | 379862ec5a413e636d977a6ea3d618f0b3eafceb (patch) | |
tree | 090daa36792fd9af62b2ac6ead8ce13b370d8821 /git-rebase--merge.sh | |
parent | 5ec514bd2f9b18463886df372ea1412fc61467de (diff) | |
download | git-379862ec5a413e636d977a6ea3d618f0b3eafceb.tar.gz |
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>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions