Skip to content

Commit 631f0f8

Browse files
peffgitster
authored andcommitted
ls-remote: do not send ref prefixes for patterns
Since b4be741 (ls-remote: pass ref prefixes when requesting a remote's refs, 2018-03-15), "ls-remote foo" will pass "refs/heads/foo", "refs/tags/foo", etc to the transport code in an attempt to let the other side reduce the size of its advertisement. Unfortunately this is not correct, as ls-remote patterns do not follow the usual ref lookup rules, and are in fact tail-matched. So we could find "refs/heads/foo" or "refs/heads/a/much/deeper/foo" or even "refs/another/hierarchy/foo". Since we can't pass a prefix and there's not yet a v2 extension for matching wildcards, we must disable this feature to keep the same behavior as v1. Reported-by: Jon Simons <[email protected]> Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 268fbcd commit 631f0f8

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

builtin/ls-remote.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
8888
int i;
8989
pattern = xcalloc(argc, sizeof(const char *));
9090
for (i = 1; i < argc; i++) {
91-
const char *glob;
9291
pattern[i - 1] = xstrfmt("*/%s", argv[i]);
93-
94-
glob = strchr(argv[i], '*');
95-
if (glob)
96-
argv_array_pushf(&ref_prefixes, "%.*s",
97-
(int)(glob - argv[i]), argv[i]);
98-
else
99-
expand_ref_prefix(&ref_prefixes, argv[i]);
10092
}
10193
}
10294

t/t5512-ls-remote.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,13 @@ test_expect_success 'ls-remote works outside repository' '
304304
nongit git ls-remote dst.git
305305
'
306306

307+
test_expect_success 'ls-remote patterns work with all protocol versions' '
308+
git for-each-ref --format="%(objectname) %(refname)" \
309+
refs/heads/master refs/remotes/origin/master >expect &&
310+
git -c protocol.version=1 ls-remote . master >actual.v1 &&
311+
test_cmp expect actual.v1 &&
312+
git -c protocol.version=2 ls-remote . master >actual.v2 &&
313+
test_cmp expect actual.v2
314+
'
315+
307316
test_done

0 commit comments

Comments
 (0)