@matheusbsbs / matheus-bagliano / commits / 09444e74e3

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>

Ævar Arnfjörð Bjarmason committed Jan 26, 2022 at 15:37 UTC 09444e74e3acf4e726db60a5595eb7d3ebca8450

1 file changed +4 -6

sequencer.c

+4 -6

@@ -1281,7 +1281,7 @@ void print_commit_summary(struct repository *r,

1281 struct strbuf author_ident = STRBUF_INIT;

1282 struct strbuf committer_ident = STRBUF_INIT;

1283 struct ref_store *refs;

1284 - int resolve_errno;

1284 + int ignore_errno;

1285

1286 commit = lookup_commit(r, oid);

1287 if (!commit)

@@ -1333,11 +1333,9 @@ void print_commit_summary(struct repository *r,

1333

1334 refs = get_main_ref_store(the_repository);

1335 head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL,

1336 - &resolve_errno);

1337 - if (!head) {

1338 - errno = resolve_errno;

1339 - die_errno(_("unable to resolve HEAD after creating commit"));

1340 - }

1336 + &ignore_errno);

1337 + if (!head)

1338 + die(_("unable to resolve HEAD after creating commit"));

1339 if (!strcmp(head, "HEAD"))

1340 head = _("detached HEAD");

1341 else