diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:17 (GMT) |
| commit | 81c365bbd1ea68da62755f6242d65834af469c73 (patch) | |
| tree | 6b943f81b878963ccf675d82290970bee89836fe /builtin | |
| parent | 879a8d4bf2412303ec940d69165b0937c11a2851 (diff) | |
| parent | 6a139cdd74b867b5d717854155b4192e84c1f170 (diff) | |
| download | git-81c365bbd1ea68da62755f6242d65834af469c73.zip git-81c365bbd1ea68da62755f6242d65834af469c73.tar.gz git-81c365bbd1ea68da62755f6242d65834af469c73.tar.bz2 | |
Merge branch 'jk/proto-v2-ref-prefix-fix'
"git ls-remote $there foo" was broken by recent update for the
protocol v2 and stopped showing refs that match 'foo' that are not
refs/{heads,tags}/foo, which has been fixed.
* jk/proto-v2-ref-prefix-fix:
ls-remote: pass heads/tags prefixes to transport
ls-remote: do not send ref prefixes for patterns
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/ls-remote.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 6a0cdec..1d7f1f5 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -88,18 +88,15 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) int i; pattern = xcalloc(argc, sizeof(const char *)); for (i = 1; i < argc; i++) { - const char *glob; pattern[i - 1] = xstrfmt("*/%s", argv[i]); - - glob = strchr(argv[i], '*'); - if (glob) - argv_array_pushf(&ref_prefixes, "%.*s", - (int)(glob - argv[i]), argv[i]); - else - expand_ref_prefix(&ref_prefixes, argv[i]); } } + if (flags & REF_TAGS) + argv_array_push(&ref_prefixes, "refs/tags/"); + if (flags & REF_HEADS) + argv_array_push(&ref_prefixes, "refs/heads/"); + remote = remote_get(dest); if (!remote) { if (dest) |