diff options
author | Russell Belfer <rb@github.com> | 2012-10-06 02:56:57 +0400 |
---|---|---|
committer | Russell Belfer <rb@github.com> | 2012-10-09 22:59:34 +0400 |
commit | 0d64bef941928046d114c4da1acb70bd2907855e (patch) | |
tree | 4ae0ac6484c62b0a63ca44f937d67ba15f97d7f0 /src/reflog.c | |
parent | f3a04e0f49d0f46e578613d1c27161abc4c2bf22 (diff) |
Add complex checkout test and then fix checkout
This started as a complex new test for checkout going through the
"typechanges" test repository, but that revealed numerous issues
with checkout, including:
* complete failure with submodules
* failure to create blobs with exec bits
* problems when replacing a tree with a blob because the tree
"example/" sorts after the blob "example" so the delete was
being processed after the single file blob was created
This fixes most of those problems and includes a number of other
minor changes that made it easier to do that, including improving
the TYPECHANGE support in diff/status, etc.
Diffstat (limited to 'src/reflog.c')
-rw-r--r-- | src/reflog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflog.c b/src/reflog.c index 80e40b960..a1ea7a27d 100644 --- a/src/reflog.c +++ b/src/reflog.c @@ -372,7 +372,7 @@ int git_reflog_rename(git_reference *ref, const char *new_name) goto cleanup; if (git_path_isdir(git_buf_cstr(&new_path)) && - (git_futils_rmdir_r(git_buf_cstr(&new_path), GIT_DIRREMOVAL_ONLY_EMPTY_DIRS) < 0)) + (git_futils_rmdir_r(git_buf_cstr(&new_path), NULL, GIT_DIRREMOVAL_ONLY_EMPTY_DIRS) < 0)) goto cleanup; if (git_futils_mkpath2file(git_buf_cstr(&new_path), GIT_REFLOG_DIR_MODE) < 0) |