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
This commit is contained in:
Junio C Hamano 2009-09-03 09:42:38 -07:00
commit ba7e81430a
3 changed files with 8 additions and 4 deletions

View file

@ -76,7 +76,7 @@ then the cloned repository will become corrupt.
--reference <repository>:: --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 automatically setup .git/objects/info/alternates to
obtain objects from the reference repository. Using obtain objects from the reference repository. Using
an already existing repository as an alternate will an already existing repository as an alternate will

View file

@ -551,8 +551,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
option_no_checkout = 1; option_no_checkout = 1;
} }
if (transport) if (transport) {
transport_unlock_pack(transport); transport_unlock_pack(transport);
transport_disconnect(transport);
}
if (!option_no_checkout) { if (!option_no_checkout) {
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));

View file

@ -149,11 +149,13 @@ test_expect_success 'clone a void' '
( (
cd src-0 && git init 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 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 # There is no reason to insist they are bit-for-bit
# identical, but this test should suffice for now. # identical, but this test should suffice for now.
test_cmp target-6/.git/config target-7/.git/config test_cmp target-6/.git/config target-7/.git/config