Skip to content

Commit

Permalink
Merge branch 'maint-1.6.2' into maint-1.6.3
Browse files Browse the repository at this point in the history
* maint-1.6.2:
  git-clone: add missing comma in --reference documentation
  clone: disconnect transport after fetching
  • Loading branch information
Junio C Hamano committed Sep 3, 2009
2 parents d2feb01 + 4059237 commit ba7e814
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Documentation/git-clone.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion builtin-clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
6 changes: 4 additions & 2 deletions t/t5601-clone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ba7e814

Please sign in to comment.