summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-19 23:24:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-19 23:24:34 -0700
commit32b31ab7f3ff52eafc40033b890b313efaed8c56 (patch)
tree54d5497cda12f3d5120006d195fb856f6e4e7ee7 /builtin
parentMerge branch 'ss/mergetool--lib' (diff)
parentgit-request-pull: open-code the only invocation of get_remote_url (diff)
downloadtgif-32b31ab7f3ff52eafc40033b890b313efaed8c56.tar.xz
Merge branch 'uk/ls-remote-in-get-remote-url'
* uk/ls-remote-in-get-remote-url: git-request-pull: open-code the only invocation of get_remote_url get_remote_url(): use the same data source as ls-remote to get remote urls
Diffstat (limited to 'builtin')
-rw-r--r--builtin/ls-remote.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 97eed4012b..1a1ff87e8f 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -33,6 +33,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
int i;
const char *dest = NULL;
unsigned flags = 0;
+ int get_url = 0;
int quiet = 0;
const char *uploadpack = NULL;
const char **pattern = NULL;
@@ -69,6 +70,10 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
quiet = 1;
continue;
}
+ if (!strcmp("--get-url", arg)) {
+ get_url = 1;
+ continue;
+ }
usage(ls_remote_usage);
}
dest = arg;
@@ -94,6 +99,12 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
}
if (!remote->url_nr)
die("remote %s has no configured URL", dest);
+
+ if (get_url) {
+ printf("%s\n", *remote->url);
+ return 0;
+ }
+
transport = transport_get(remote, NULL);
if (uploadpack != NULL)
transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);