mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-24 02:36:08 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2018-11-13 22:37:17 +09:00
parent 879a8d4bf2 6a139cdd74
commit 81c365bbd1
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/ls-remote.c
View File

@ -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)

18
t/t5512-ls-remote.sh
View File

@ -302,4 +302,22 @@ test_expect_success 'ls-remote works outside repository' '
nongit git ls-remote dst.git
'
test_expect_success 'ls-remote patterns work with all protocol versions' '
git for-each-ref --format="%(objectname) %(refname)" \
refs/heads/master refs/remotes/origin/master >expect &&
git -c protocol.version=1 ls-remote . master >actual.v1 &&
test_cmp expect actual.v1 &&
git -c protocol.version=2 ls-remote . master >actual.v2 &&
test_cmp expect actual.v2
'
test_expect_success 'ls-remote prefixes work with all protocol versions' '
git for-each-ref --format="%(objectname) %(refname)" \
refs/heads/ refs/tags/ >expect &&
git -c protocol.version=1 ls-remote --heads --tags . >actual.v1 &&
test_cmp expect actual.v1 &&
git -c protocol.version=2 ls-remote --heads --tags . >actual.v2 &&
test_cmp expect actual.v2
'
test_done