Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
git-clone: add missing comma in --reference documentation
clone: disconnect transport after fetching

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index b14de6c407b8bd0bc001c608ca4f26fc619abf3e..87c13ab13eb05e67312bf45de3e31ca30f7a01ab 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -76,7 +76,7 @@ then the cloned repository will become corrupt.
 
 
 --reference <repository>::
-       If the reference repository is on the local machine
+       If the reference repository is on the local machine,
        automatically setup .git/objects/info/alternates to
        obtain objects from the reference repository.  Using
        an already existing repository as an alternate will

diff --git a/builtin-clone.c b/builtin-clone.c
index ba286e0160c494244810334e3a0b43a59756e84a..6605e83407ce70dbb77a4be51cfadec60b3db6ad 100644 (file)
--- 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 2335d8bc850b4b0010fcb9ac64a25d0c205e8a42..214756731baf199e6a50f9ab2380a8b4bfc0fb18 100755 (executable)
--- 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