diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-01-26 14:37:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-26 23:58:38 (GMT) |
| commit | 09444e74e3acf4e726db60a5595eb7d3ebca8450 (patch) | |
| tree | ed2777cb0c9c8a555029a8e126533507795f544c /sequencer.c | |
| parent | 89bece5c8c96f0b962cfc89e63f82d603fd60bed (diff) | |
| download | git-09444e74e3acf4e726db60a5595eb7d3ebca8450.zip git-09444e74e3acf4e726db60a5595eb7d3ebca8450.tar.gz git-09444e74e3acf4e726db60a5595eb7d3ebca8450.tar.bz2 | |
sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure
Change code that was faithfully migrated to the new "resolve_errno"
API in ed90f04155d (refs API: make resolve_ref_unsafe() not set errno,
2021-10-16) to stop caring about the errno at all.
When we fail to resolve "HEAD" after the sequencer runs it doesn't
really help to say what the "errno" value is, since the fake backend
errno may or may not reflect anything real about the state of the
".git/HEAD". With the upcoming reftable backend this fakery will
become even more pronounced.
So let's just die() instead of die_errno() here. This will also help
simplify the refs_resolve_ref_unsafe() API. This was the only user of
it that wasn't ignoring the "failure_errno" output parameter.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sequencer.c b/sequencer.c index 6abd721..03cdf54 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1281,7 +1281,7 @@ void print_commit_summary(struct repository *r, struct strbuf author_ident = STRBUF_INIT; struct strbuf committer_ident = STRBUF_INIT; struct ref_store *refs; - int resolve_errno; + int ignore_errno; commit = lookup_commit(r, oid); if (!commit) @@ -1333,11 +1333,9 @@ void print_commit_summary(struct repository *r, refs = get_main_ref_store(the_repository); head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL, - &resolve_errno); - if (!head) { - errno = resolve_errno; - die_errno(_("unable to resolve HEAD after creating commit")); - } + &ignore_errno); + if (!head) + die(_("unable to resolve HEAD after creating commit")); if (!strcmp(head, "HEAD")) head = _("detached HEAD"); else |