diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-12 00:55:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-12 00:55:58 (GMT) |
| commit | 03bdcfcc78f476d58449c9635e95916b7b71f3dd (patch) | |
| tree | 882cd230084f9259e1143fbf0cb6e26ebe7e0b95 /sequencer.c | |
| parent | c46452eb989a61ce76e24bb74b7f2c9a2efe6083 (diff) | |
| parent | ce14de03db6e1a29ad92c747542f1eb4357f25d6 (diff) | |
| download | git-03bdcfcc78f476d58449c9635e95916b7b71f3dd.zip git-03bdcfcc78f476d58449c9635e95916b7b71f3dd.tar.gz git-03bdcfcc78f476d58449c9635e95916b7b71f3dd.tar.bz2 | |
Merge branch 'ab/no-errno-from-resolve-ref-unsafe'
Remaining code-clean-up.
* ab/no-errno-from-resolve-ref-unsafe:
refs API: remove "failure_errno" from refs_resolve_ref_unsafe()
sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sequencer.c b/sequencer.c index 5213d16..fb978a5 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1281,7 +1281,6 @@ 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; commit = lookup_commit(r, oid); if (!commit) @@ -1332,12 +1331,9 @@ void print_commit_summary(struct repository *r, diff_setup_done(&rev.diffopt); 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")); - } + head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL); + if (!head) + die(_("unable to resolve HEAD after creating commit")); if (!strcmp(head, "HEAD")) head = _("detached HEAD"); else |