diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-02 18:45:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-02 18:45:44 -0700 |
| commit | 8cc15acfb8845bd23f68c92a51b68d57a72a9fed (patch) | |
| tree | 186b074ca23eb3246218d692b2014afe023fda8a | |
| parent | d2feb01aa580843261c25d8609369d17bcdf6028 (diff) | |
| parent | 12d4996622f524e61cbf855b32600150a8c94c02 (diff) | |
| download | git-8cc15acfb8845bd23f68c92a51b68d57a72a9fed.tar.gz git-8cc15acfb8845bd23f68c92a51b68d57a72a9fed.tar.xz | |
Merge branch 'maint-1.6.2' into maint-1.6.3
* maint-1.6.2:
clone: disconnect transport after fetching
| -rw-r--r-- | builtin-clone.c | 4 | ||||
| -rwxr-xr-x | t/t5601-clone.sh | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/builtin-clone.c b/builtin-clone.c index ba286e016..6605e8340 100644 --- a/builtin-clone.c +++ b/builtin-clone.c @@ -551,8 +551,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix) option_no_checkout = 1; } - if (transport) + if (transport) { transport_unlock_pack(transport); + transport_disconnect(transport); + } if (!option_no_checkout) { struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 2335d8bc8..214756731 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -149,11 +149,13 @@ test_expect_success 'clone a void' ' ( cd src-0 && git init ) && - git clone src-0 target-6 && + git clone "file://$(pwd)/src-0" target-6 2>err-6 && + ! grep "fatal:" err-6 && ( cd src-0 && test_commit A ) && - git clone src-0 target-7 && + git clone "file://$(pwd)/src-0" target-7 2>err-7 && + ! grep "fatal:" err-7 && # There is no reason to insist they are bit-for-bit # identical, but this test should suffice for now. test_cmp target-6/.git/config target-7/.git/config |