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

fetch: report errors when backfilling tags fails

Browse Source 
When the backfilling of tags fails we do not report this error to the
caller, but only report it implicitly at a later point when reporting
updated references. This leaves callers unable to act upon the
information of whether the backfilling succeeded or not.

Refactor the function to return an error code and pass it up the
callstack. This causes us to correctly propagate the error back to the
user of git-fetch(1).

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:28 +01:00 committed by Junio C Hamano
parent 2983cec0f2
commit 62091b4c87
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/fetch.c
View File

@ -1495,12 +1495,12 @@ static struct transport *prepare_transport(struct remote *remote, int deepen)
return transport;
}
static void backfill_tags(struct transport *transport,
struct ref *ref_map,
struct fetch_head *fetch_head,
struct worktree **worktrees)
static int backfill_tags(struct transport *transport,
struct ref *ref_map,
struct fetch_head *fetch_head,
struct worktree **worktrees)
{
int cannot_reuse;
int retcode, cannot_reuse;
/*
* Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
@ -1519,12 +1519,14 @@ static void backfill_tags(struct transport *transport,
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
transport_set_option(transport, TRANS_OPT_DEPTH, "0");
transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
fetch_and_consume_refs(transport, ref_map, fetch_head, worktrees);
retcode = fetch_and_consume_refs(transport, ref_map, fetch_head, worktrees);
if (gsecondary) {
transport_disconnect(gsecondary);
gsecondary = NULL;
}
return retcode;
}
static int do_fetch(struct transport *transport,
@ -1632,8 +1634,16 @@ static int do_fetch(struct transport *transport,
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, &fetch_head, worktrees);
if (tags_ref_map) {
/*
* If backfilling of tags fails then we want to tell
* the user so, but we have to continue regardless to
* populate upstream information of the references we
* have already fetched above.
*/
if (backfill_tags(transport, tags_ref_map, &fetch_head, worktrees))
retcode = 1;
}
free_refs(tags_ref_map);
}

4
t/t5503-tagfollow.sh
View File

@ -233,9 +233,7 @@ test_expect_success 'backfill failure causes command to fail' '
done
EOF
# Even though we fail to create refs/tags/tag1 the below command
# unexpectedly succeeds.
git -C clone5 fetch .. $B:refs/heads/something &&
test_must_fail git -C clone5 fetch .. $B:refs/heads/something &&
test $B = $(git -C clone5 rev-parse --verify refs/heads/something) &&
test $S = $(git -C clone5 rev-parse --verify tag2) &&
test_must_fail git -C clone5 rev-parse --verify tag1