mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/set-head-symref-fix'

Browse Source 
"git fetch" from a configured remote learned to update a missing
remote-tracking HEAD but it asked the remote about their HEAD even
when it did not need to, which has been corrected.  Incidentally,
this also corrects "git fetch --tags $URL" which was broken by the
new feature in an unspecified way.

* jc/set-head-symref-fix:
  fetch: do not ask for HEAD unnecessarily
This commit is contained in:
Junio C Hamano
2024-12-19 10:58:28 -08:00
parent 5f212684ab 6c915c3f85
commit ae75cefd94
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
builtin/fetch.c
View File

@ -1640,6 +1640,21 @@ cleanup:
return result;
}
static int uses_remote_tracking(struct transport *transport, struct refspec *rs)
{
if (!remote_is_configured(transport->remote, 0))
return 0;
if (!rs->nr)
rs = &transport->remote->fetch;
for (int i = 0; i < rs->nr; i++)
if (rs->items[i].dst)
return 1;
return 0;
}
static int do_fetch(struct transport *transport,
struct refspec *rs,
const struct fetch_config *config)
@ -1709,7 +1724,10 @@ static int do_fetch(struct transport *transport,
"refs/tags/");
}
strvec_push(&transport_ls_refs_options.ref_prefixes, "HEAD");
if (uses_remote_tracking(transport, rs)) {
must_list_refs = 1;
strvec_push(&transport_ls_refs_options.ref_prefixes, "HEAD");
}
if (must_list_refs) {
trace2_region_enter("fetch", "remote_refs", the_repository);

17
t/t5510-fetch.sh
View File

@ -188,6 +188,23 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec'
git rev-parse sometag
'
test_expect_success 'fetch --tags gets tags even without a configured remote' '
REMOTE="$(pwd)/test_tag_1" &&
git init test_tag_1 &&
(
cd test_tag_1 &&
test_commit foo
) &&
git init test_tag_2 &&
(
cd test_tag_2 &&
git fetch --tags "file://$REMOTE" &&
echo "foo" >expect &&
git tag >actual &&
test_cmp expect actual
)
'
test_expect_success REFFILES 'fetch --prune fails to delete branches' '
cd "$D" &&
git clone . prune-fail &&