Reteach builtin-ls-remote to understand remotes

Prior to being made a builtin git-ls-remote understood that when
it was given a remote name we wanted it to resolve that to the
pre-configured URL and connect to that location.  That changed when
it was converted to a builtin and many of my automation tools broke.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shawn O. Pearce 2007-11-06 20:29:20 -05:00 committed by Junio C Hamano
parent 8951d7c1f1
commit 7c2c6ee7e0
2 changed files with 57 additions and 1 deletions

View file

@ -14,6 +14,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
unsigned flags = 0;
const char *uploadpack = NULL;
struct remote *remote;
struct transport *transport;
const struct ref *ref;
@ -52,7 +53,10 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
if (!dest || i != argc - 1)
usage(ls_remote_usage);
transport = transport_get(NULL, dest);
remote = nongit ? NULL : remote_get(dest);
if (remote && !remote->url_nr)
die("remote %s has no configured URL", dest);
transport = transport_get(remote, remote ? remote->url[0] : dest);
if (uploadpack != NULL)
transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);

52
t/t5512-ls-remote.sh Executable file
View file

@ -0,0 +1,52 @@
#!/bin/sh
test_description='git ls-remote'
. ./test-lib.sh
test_expect_success setup '
>file &&
git add file &&
test_tick &&
git commit -m initial &&
git tag mark &&
git show-ref --tags -d | sed -e "s/ / /" >expected.tag &&
(
echo "$(git rev-parse HEAD) HEAD"
git show-ref -d | sed -e "s/ / /"
) >expected.all &&
git remote add self $(pwd)/.git
'
test_expect_success 'ls-remote --tags .git' '
git ls-remote --tags .git >actual &&
diff -u expected.tag actual
'
test_expect_success 'ls-remote .git' '
git ls-remote .git >actual &&
diff -u expected.all actual
'
test_expect_success 'ls-remote --tags self' '
git ls-remote --tags self >actual &&
diff -u expected.tag actual
'
test_expect_success 'ls-remote self' '
git ls-remote self >actual &&
diff -u expected.all actual
'
test_done