diff options
| -rw-r--r-- | builtin-ls-remote.c | 6 | ||||
| -rwxr-xr-x | t/t5512-ls-remote.sh | 52 |
2 files changed, 57 insertions, 1 deletions
diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c index 003580c26a..56f3f88023 100644 --- a/builtin-ls-remote.c +++ b/builtin-ls-remote.c @@ -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); diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh new file mode 100755 index 0000000000..6ec5f7c48b --- /dev/null +++ b/t/t5512-ls-remote.sh @@ -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 |