From bdc552b256bde08903a2d1b5a126c33fa66011fc Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 5 Oct 2015 19:21:02 +0000 Subject: [PATCH] fixup! clone --dissociate: avoid locking pack files --- builtin/clone.c | 9 +-------- t/t5700-clone-reference.sh | 21 --------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index 7dd5427f39..afcf1ac1cc 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1066,15 +1066,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) transport_unlock_pack(transport); transport_disconnect(transport); - if (option_dissociate) { - struct packed_git *p; - - for (p = packed_git; p; p = p->next) { - close_pack_windows(p); - close_pack_index(p); - } + if (option_dissociate) 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 2250ef4fe2..ef1779f5ca 100755 --- a/t/t5700-clone-reference.sh +++ b/t/t5700-clone-reference.sh @@ -188,26 +188,5 @@ test_expect_success 'clone and dissociate from reference' ' test_must_fail git -C R fsck && git -C S fsck ' -test_expect_success 'clone, dissociate from partial reference and repack' ' - rm -fr P Q R && - git init P && - ( - cd P && - test_commit one && - git repack && - test_commit two && - git repack - ) && - git clone --bare P Q && - ( - cd P && - git checkout -b second && - test_commit three && - git repack - ) && - git clone --bare --dissociate --reference=P Q R && - ls R/objects/pack/*.pack >packs.txt && - test_line_count = 1 packs.txt -' test_done