From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Michael Haggerty <mhagger@alum.mit.edu>,
David Turner <novalis@novalis.org>,
git@vger.kernel.org, David Turner <dturner@twosigma.com>
Subject: Re: thoughts on error passing, was Re: [PATCH 2/2] fsck: handle bad trees like other errors
Date: Wed, 28 Sep 2016 11:02:27 -0700 [thread overview]
Message-ID: <xmqqh98zkimk.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160928085841.aoisson3fnuke47q@sigill.intra.peff.net> (Jeff King's message of "Wed, 28 Sep 2016 04:58:41 -0400")
Jeff King <peff@peff.net> writes:
> if (!dont_change_ref) {
> struct ref_transaction *transaction;
> - struct strbuf err = STRBUF_INIT;
> -
> - transaction = ref_transaction_begin(&err);
> - if (!transaction ||
> - ref_transaction_update(transaction, ref.buf,
> - sha1, forcing ? NULL : null_sha1,
> - 0, msg, &err) ||
> - ref_transaction_commit(transaction, &err))
> - die("%s", err.buf);
> +
> + transaction = ref_transaction_begin(&error_die);
> + ref_transaction_update(transaction, ref.buf,
> + sha1, forcing ? NULL : null_sha1,
> + 0, msg, &error_die);
> + ref_transaction_commit(transaction, &error_die);
> ref_transaction_free(transaction);
> - strbuf_release(&err);
> }
>
> if (real_ref && track)
>
> which is much shorter and to the point (it does rely on the called
> functions always calling report_error() and never just returning NULL or
> "-1", but that should be the already. If it isn't, we'd be printing
> "fatal: " with no message).
Yes but... grepping for die() got a lot harder, which may not be a
good thing.
I do like the flexibility such a mechanism offers, but
wrapping/hiding die in it is probably an example that the
flexibility went a bit too far.
next prev parent reply other threads:[~2016-09-28 18:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 19:32 [PATCH 0/2] tree-walk improvements David Turner
2016-09-26 19:32 ` [PATCH 1/2] tree-walk: be more specific about corrupt tree errors David Turner
2016-09-27 5:14 ` Jeff King
2016-09-27 5:35 ` Junio C Hamano
2016-09-27 15:21 ` David Turner
2016-09-26 19:32 ` [PATCH 2/2] fsck: handle bad trees like other errors David Turner
2016-09-26 19:51 ` Junio C Hamano
2016-09-26 20:08 ` Junio C Hamano
2016-09-26 20:11 ` Junio C Hamano
2016-09-27 5:27 ` Jeff King
2016-09-27 15:19 ` David Turner
2016-09-27 19:19 ` thoughts on error passing, was " Jeff King
2016-09-27 22:57 ` David Turner
2016-09-28 6:54 ` Jeff King
2016-09-28 5:01 ` Michael Haggerty
2016-09-28 8:58 ` Jeff King
2016-09-28 18:02 ` Junio C Hamano [this message]
2016-09-26 19:39 ` [PATCH 0/2] tree-walk improvements Stefan Beller
2016-09-26 19:43 ` Junio C Hamano
2016-09-26 20:22 ` David Turner
2016-09-27 0:35 ` Junio C Hamano
2016-09-26 21:04 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh98zkimk.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=novalis@novalis.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).