Skip to content

Commit

Permalink
Propagate -u/--upload-pack option of "git clone" to transport.
Browse files Browse the repository at this point in the history
The -u option to override the remote system's path to git-upload-pack was
being ignored by "git clone"; caused by a missing call to
transport_set_option to set TRANS_OPT_UPLOADPACK. Presumably this crept in
when git-clone was converted from shell to C.

Signed-off-by: Steve Haslam <shaslam@lastminute.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Steve Haslam authored and Junio C Hamano committed Jul 26, 2008
1 parent 7198203 commit 837c876
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
4 changes: 4 additions & 0 deletions builtin-clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_quiet)
transport->verbose = -1;

if (option_upload_pack)
transport_set_option(transport, TRANS_OPT_UPLOADPACK,
option_upload_pack);

refs = transport_get_remote_refs(transport);
transport_fetch_refs(transport, refs);
}
Expand Down
26 changes: 26 additions & 0 deletions t/t5602-clone-remote-exec.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/sh

test_description=clone

. ./test-lib.sh

test_expect_success setup '
echo "#!/bin/sh" > not_ssh
echo "echo \"\$*\" > not_ssh_output" >> not_ssh
echo "exit 1" >> not_ssh
chmod +x not_ssh
'

test_expect_success 'clone calls git-upload-pack unqualified with no -u option' '
GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk
echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected
test_cmp expected not_ssh_output
'

test_expect_success 'clone calls specified git-upload-pack with -u option' '
GIT_SSH=./not_ssh git clone -u /something/bin/git-upload-pack localhost:/path/to/repo junk
echo "localhost /something/bin/git-upload-pack '\''/path/to/repo'\''" >expected
test_cmp expected not_ssh_output
'

test_done

0 comments on commit 837c876

Please sign in to comment.