summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2016-05-05 15:33:03 +0200
committerLibravatar Michael Haggerty <mhagger@alum.mit.edu>2016-05-05 16:31:17 +0200
commit5387c0d8839e366c44838c808ccc20eb7f9bd358 (patch)
tree8a892e8d400343d7fd17e05e95b7f4d8600bef38 /contrib/fast-import
parentt1404: demonstrate a bug resolving references (diff)
downloadtgif-5387c0d8839e366c44838c808ccc20eb7f9bd358.tar.xz
commit_ref(): if there is an empty dir in the way, delete it
Part of the bug revealed in the last commit is that resolve_ref_unsafe() incorrectly returns EISDIR if it finds a directory in the place where it is looking for a loose reference, even if the corresponding packed reference exists. lock_ref_sha1_basic() notices the bogus EISDIR, and use it as an indication that it should call remove_empty_directories() and call resolve_ref_unsafe() again. But resolve_ref_unsafe() shouldn't report EISDIR in this case. If we would simply make that change, then remove_empty_directories() wouldn't get called anymore, and the empty directory would get in the way when commit_ref() calls commit_lock_file() to rename the lockfile into place. So instead of relying on lock_ref_sha1_basic() to delete empty directories, teach commit_ref(), just before calling commit_lock_file(), to check whether a directory is in the way, and if so, try to delete it. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Diffstat (limited to 'contrib/fast-import')
0 files changed, 0 insertions, 0 deletions