зеркало из https://github.com/microsoft/git.git
Propagate -u/--upload-pack option of "git clone" to transport.
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>
This commit is contained in:
Родитель
bbff8aaaf2
Коммит
31f4e768a4
|
@ -473,6 +473,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
||||||
if (option_quiet)
|
if (option_quiet)
|
||||||
transport->verbose = -1;
|
transport->verbose = -1;
|
||||||
|
|
||||||
|
if (option_upload_pack)
|
||||||
|
transport_set_option(transport, TRANS_OPT_UPLOADPACK,
|
||||||
|
option_upload_pack);
|
||||||
|
|
||||||
refs = transport_get_remote_refs(transport);
|
refs = transport_get_remote_refs(transport);
|
||||||
transport_fetch_refs(transport, refs);
|
transport_fetch_refs(transport, refs);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
Загрузка…
Ссылка в новой задаче