clone --dissociate: avoid locking pack files

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 https://github.com/git-for-windows/git/issues/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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/clone.c b/builtin/clone.c
index e18839d1077aaa383f601429541f2fc25972f36c..6633d8703855377418237ac98e226dcfc28ee0da 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -995,8 +995,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();

diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index b6c056619cf70db9038b91d5d3b2269d786a138c..057da59ae0fdcbfb3cebebf6f2a3daab37052f3f 100755 (executable)
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -214,7 +214,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 &&
        (