summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2015-10-06 13:18:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-07 17:47:50 (GMT)
commit786b150c8d0960cb7c36fb1cbbf70dbd76b586de (patch)
tree2667718cc3d6b6a1fc6a1c1fb06bb3e8daf7ef34
parent38849a8116e690071c02eba0a8ef60a031a58080 (diff)
downloadgit-786b150c8d0960cb7c36fb1cbbf70dbd76b586de.zip
git-786b150c8d0960cb7c36fb1cbbf70dbd76b586de.tar.gz
git-786b150c8d0960cb7c36fb1cbbf70dbd76b586de.tar.bz2
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>
-rw-r--r--builtin/clone.c4
-rwxr-xr-xt/t5700-clone-reference.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index e18839d..6633d87 100644
--- 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 b6c0566..057da59 100755
--- 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 &&
(