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

fetch: backfill tags before setting upstream

Browse Source 
The fetch code flow is a bit hard to understand right now:

    1. We optionally prune all references which have vanished on the
       remote side.
    2. We fetch and update all other references locally.
    3. We update the upstream branch in the gitconfig.
    4. We backfill tags pointing into the history we have just fetched.

It is quite confusing that we fetch objects and update references in
both (2) and (4), which is further stressed by the point that we use a
`skip` goto label to jump from (3) to (4) in case we fail to update the
gitconfig as expected.

Reorder the code to first update all local references, and only after we
have done so update the upstream branch information. This improves the
code flow and furthermore makes it easier to refactor the way we update
references together.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2022-02-17 14:04:20 +01:00 committed by Junio C Hamano
parent 2a0cafd464
commit efbade0660
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
builtin/fetch.c
View File

@ -1536,7 +1536,7 @@ static void backfill_tags(struct transport *transport, struct ref *ref_map,
static int do_fetch(struct transport *transport, static int do_fetch(struct transport *transport,
struct refspec *rs) struct refspec *rs)
{ {
struct ref *ref_map; struct ref *ref_map = NULL;
int autotags = (transport->remote->fetch_tags == 1); int autotags = (transport->remote->fetch_tags == 1);
int retcode = 0; int retcode = 0;
const struct ref *remote_refs; const struct ref *remote_refs;
@ -1620,11 +1620,24 @@ static int do_fetch(struct transport *transport,
retcode = 1; retcode = 1;
} }
if (fetch_and_consume_refs(transport, ref_map, worktrees)) { if (fetch_and_consume_refs(transport, ref_map, worktrees)) {
free_refs(ref_map);
retcode = 1; retcode = 1;
goto cleanup; goto cleanup;
} }
/*
* If neither --no-tags nor --tags was specified, do automated tag
* following.
*/
if (tags == TAGS_DEFAULT && autotags) {
struct ref *tags_ref_map = NULL, **tail = &tags_ref_map;
find_non_local_tags(remote_refs, &tags_ref_map, &tail);
if (tags_ref_map)
backfill_tags(transport, tags_ref_map, worktrees);
free_refs(tags_ref_map);
}
if (set_upstream) { if (set_upstream) {
struct branch *branch = branch_get("HEAD"); struct branch *branch = branch_get("HEAD");
struct ref *rm; struct ref *rm;
@ -1644,7 +1657,7 @@ static int do_fetch(struct transport *transport,
if (!rm->peer_ref) { if (!rm->peer_ref) {
if (source_ref) { if (source_ref) {
warning(_("multiple branches detected, incompatible with --set-upstream")); warning(_("multiple branches detected, incompatible with --set-upstream"));
goto skip; goto cleanup;
} else { } else {
source_ref = rm; source_ref = rm;
} }
@ -1658,7 +1671,7 @@ static int do_fetch(struct transport *transport,
warning(_("could not set upstream of HEAD to '%s' from '%s' when " warning(_("could not set upstream of HEAD to '%s' from '%s' when "
"it does not point to any branch."), "it does not point to any branch."),
shortname, transport->remote->name); shortname, transport->remote->name);
goto skip; goto cleanup;
} }
if (!strcmp(source_ref->name, "HEAD") || if (!strcmp(source_ref->name, "HEAD") ||
@ -1678,21 +1691,9 @@ static int do_fetch(struct transport *transport,
"you need to specify exactly one branch with the --set-upstream option")); "you need to specify exactly one branch with the --set-upstream option"));
} }
} }
skip:
free_refs(ref_map);
/* if neither --no-tags nor --tags was specified, do automated tag
* following ... */
if (tags == TAGS_DEFAULT && autotags) {
struct ref **tail = &ref_map;
ref_map = NULL;
find_non_local_tags(remote_refs, &ref_map, &tail);
if (ref_map)
backfill_tags(transport, ref_map, worktrees);
free_refs(ref_map);
}
cleanup: cleanup:
free_refs(ref_map);
free_worktrees(worktrees); free_worktrees(worktrees);
return retcode; return retcode;
} }