diff options
| author |  Brandon Williams <bmwill@google.com> | 2018-05-16 16:48:22 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-18 06:35:37 +0900 |
| commit | dcc73cf7ffd17e68bda05fff4c139465580aff28 (patch) | |
| tree | ee4686099c014f6b78cc5fea93980e52020fd9c6 | |
| parent | refspec: consolidate ref-prefix generation logic (diff) | |
| download | tgif-dcc73cf7ffd17e68bda05fff4c139465580aff28.tar.xz | |
fetch: generate ref-prefixes when using a configured refspec
Teach fetch to generate ref-prefixes, to be used for server-side
filtering of the ref-advertisement, based on the configured fetch
refspec ('remote.<name>.fetch') when no user provided refspec exists.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/fetch.c | 10 | ||||
| -rwxr-xr-x | t/t5702-protocol-v2.sh | 14 |
2 files changed, 23 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 80bb143707..7cc7a52dee 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -351,7 +351,15 @@ static struct ref *get_ref_map(struct transport *transport, const struct ref *remote_refs; - refspec_ref_prefixes(rs, &ref_prefixes); + if (rs->nr) + refspec_ref_prefixes(rs, &ref_prefixes); + else if (transport->remote && transport->remote->fetch.nr) + refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes); + + if (ref_prefixes.argc && + (tags == TAGS_SET || (tags == TAGS_DEFAULT && !rs->nr))) { + argv_array_push(&ref_prefixes, "refs/tags/"); + } remote_refs = transport_get_remote_refs(transport, &ref_prefixes); diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh index 56f7c3c326..b6c72ab51e 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -201,6 +201,20 @@ test_expect_success 'ref advertisment is filtered during fetch using protocol v2 ! grep "refs/tags/three" log ' +test_expect_success 'default refspec is used to filter ref when fetchcing' ' + test_when_finished "rm -f log" && + + GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \ + fetch origin && + + git -C file_child log -1 --format=%s three >actual && + git -C file_parent log -1 --format=%s three >expect && + test_cmp expect actual && + + grep "ref-prefix refs/heads/" log && + grep "ref-prefix refs/tags/" log +' + # Test protocol v2 with 'http://' transport # . "$TEST_DIRECTORY"/lib-httpd.sh |