Skip to content

Commit

Permalink
clone --dissociate: avoid locking pack files
Browse files Browse the repository at this point in the history
When `git clone` is asked to dissociate the repository from the
reference repository whose objects were used, it is quite possible that
the pack files need to be repacked. In that case, the pack files need to
be deleted that were originally hard-links to the reference repository's
pack files.

On platforms where a file cannot be deleted if another process still
holds a handle on it, we therefore need to take pains to release all
pack files and indexes before dissociating.

This fixes git-for-windows#446

The test case to demonstrate the breakage technically does not need to
be run on Linux or MacOSX. It won't hurt, either, though.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Oct 5, 2015
1 parent 78d0eda commit 4580e15
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion builtin/clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -1064,8 +1064,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
transport_unlock_pack(transport);
transport_disconnect(transport);

if (option_dissociate)
if (option_dissociate) {
close_all_packs();
dissociate_from_references();
}

junk_mode = JUNK_LEAVE_REPO;
err = checkout();
Expand Down
2 changes: 1 addition & 1 deletion t/t5700-clone-reference.sh
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ test_expect_success 'clone and dissociate from reference' '
test_must_fail git -C R fsck &&
git -C S fsck
'
test_expect_failure MINGW 'clone, dissociate from partial reference and repack' '
test_expect_success 'clone, dissociate from partial reference and repack' '
rm -fr P Q R &&
git init P &&
(
Expand Down

0 comments on commit 4580e15

Please sign in to comment.