Skip to content

Commit 625ed92

Browse files
peffgitster
authored andcommitted
fetch: ask server to advertise HEAD for config-less fetch
If we're not given any refspecs (either on the command line or via config) and we have no branch merge config, then we fetch the remote HEAD into our local FETCH_HEAD. In that case we do not send any ref-prefix option to the server at all, and we see the full advertisement. But this is sub-optimal. We only care about HEAD, so we can just ask for that, and ignore all of the other refs. The new test demonstrates a case where we see fewer refs (in this case only one less, but in theory we could be ignoring millions of them). This also removes the only case where we care about seeing some refs from the other side, but don't add anything to the ref_prefixes list. Cleaning this up means one less maintenance burden. Before this patch, any code which wanted to add to the list had to make sure the list was not empty, since an empty list meant "ask for everything". Now it really means "we are not interested in any refs". This should let us optimize a few more cases in subsequent patches. Note that we'll add "HEAD" to the list of prefixes, and later code for updating "refs/remotes/<remote>/HEAD" may likewise do so. In theory this could cause duplicates in the list, but in practice these can't both trigger. We hit our new case only if there are no refspecs, and the "<remote>/HEAD" feature is enabled only when we are fetching from a remote with configured refspecs. We could be defensive with a flag, but it didn't seem worth it to me (the absolute worse case is a useless redundant ref-prefix line sent to the server). Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 36b12c3 commit 625ed92

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

builtin/fetch.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,6 +1766,14 @@ static int do_fetch(struct transport *transport,
17661766
branch->merge[i]->src);
17671767
}
17681768
}
1769+
1770+
/*
1771+
* If there are no refs specified to fetch, then we just
1772+
* fetch HEAD; mention that to narrow the advertisement.
1773+
*/
1774+
if (!transport_ls_refs_options.ref_prefixes.nr)
1775+
strvec_push(&transport_ls_refs_options.ref_prefixes,
1776+
"HEAD");
17691777
}
17701778

17711779
if (tags == TAGS_SET || tags == TAGS_DEFAULT) {

t/t5702-protocol-v2.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,21 @@ test_expect_success 'default refspec is used to filter ref when fetching' '
679679
grep "ref-prefix refs/tags/" log
680680
'
681681

682+
test_expect_success 'set up parent for prefix tests' '
683+
git init prefix-parent &&
684+
git -C prefix-parent commit --allow-empty -m foo &&
685+
git -C prefix-parent branch unrelated-branch
686+
'
687+
688+
test_expect_success 'empty refspec filters refs when fetching' '
689+
git init configless-child &&
690+
691+
test_when_finished "rm -f log" &&
692+
GIT_TRACE_PACKET="$(pwd)/log" \
693+
git -C configless-child fetch ../prefix-parent &&
694+
test_grep ! unrelated-branch log
695+
'
696+
682697
test_expect_success 'fetch supports various ways of have lines' '
683698
rm -rf server client trace &&
684699
git init server &&

0 commit comments

Comments
 (0)