undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-refs: filter refs using namespace-stripped name

Browse Source 
If a user fetches refs/heads/master from a repo with namespace "ns", the
remote is expected to (1) not send the real refs/heads/master, and (2)
send refs/namespaces/ns/refs/heads/master with the name
refs/heads/master. (1) indeed happens now, but not (2) - Git only sends
refs that have the user-given prefix, but it checks them against the
full name of the ref (the one starting with refs/namespaces), and not
the namespace-stripped one.

This is demonstrated by the patch in the test. Currently, it results in
"fatal: couldn't find remote ref refs/heads/master" despite both
unnamespaced and namespaced master being present. With the code change,
it produces the expected result.

Check the ref prefixes against the namespace-stripped name.

This bug was discovered through applying patches [1] that override
protocol.version to 2 in repositories when running tests, allowing us to
notice differences in behavior across different protocol versions.

[1] https://public-inbox.org/git/cover.1547677183.git.jonathantanmy@google.com/

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan 2019-01-17 15:33:05 -08:00 committed by Junio C Hamano
parent 77556354bb
commit e2f41a0a5a
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ls-refs.c
View File

@ -40,7 +40,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
const char *refname_nons = strip_namespace(refname); const char *refname_nons = strip_namespace(refname);
struct strbuf refline = STRBUF_INIT; struct strbuf refline = STRBUF_INIT;
if (!ref_match(&data->prefixes, refname)) if (!ref_match(&data->prefixes, refname_nons))
return 0; return 0;
strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons); strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons);

21
t/t5702-protocol-v2.sh
View File

@ -514,6 +514,27 @@ test_expect_success 'fetch with http:// using protocol v2' '
grep "git< version 2" log grep "git< version 2" log
' '
test_expect_success 'fetch from namespaced repo respects namespaces' '
test_when_finished "rm -f log" &&
git init "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" &&
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" one &&
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" two &&
git -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" \
update-ref refs/namespaces/ns/refs/heads/master one &&
GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
fetch "$HTTPD_URL/smart_namespace/nsrepo" \
refs/heads/master:refs/heads/theirs &&
# Server responded using protocol v2
grep "fetch< version 2" log &&
git -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" rev-parse one >expect &&
git -C http_child rev-parse theirs >actual &&
test_cmp expect actual
'
test_expect_success 'push with http:// and a config of v2 does not request v2' ' test_expect_success 'push with http:// and a config of v2 does not request v2' '
test_when_finished "rm -f log" && test_when_finished "rm -f log" &&
# Till v2 for push is designed, make sure that if a client has # Till v2 for push is designed, make sure that if a client has