git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Ronnie Sahlberg <sahlberg@google.com>
Cc: git@vger.kernel.org, mhagger@alum.mit.edu
Subject: Re: [PATCH v3 05/19] update-ref.c: use the error string from _commit to print better message
Date: Fri, 25 Apr 2014 15:36:20 -0700	[thread overview]
Message-ID: <20140425223620.GD9218@google.com> (raw)
In-Reply-To: <1398442494-23438-6-git-send-email-sahlberg@google.com>

Ronnie Sahlberg wrote:

> Call ref_transaction_commit with QUIET_ON_ERR and use the error string
> that is returned to print a better log message if/after the transaction
> fails.

Ah, so that's how the transition to a better API happens.  Makes sense.

(A mention of QUIET_ON_ERR in the patch that introduces the &err
parameter could help, or feel free to ignore these comments, since it's
all well by the end of the series.)

> Update the tests to reflect that the log message is now slightly different
>   fatal: update_ref failed: Cannot lock the ref 'some ref'
> versus from the previous
>   fatal: Cannot lock the ref 'some ref'

Makes sense as a demo of what the new code allows, but is this error
message better?  The use of 'git update-ref' is an implementation
detail that the user doesn't need to know about.

I think I'd prefer the result of plain die("%s", err), even though
that's a no-op.

[...]
> +++ b/builtin/update-ref.c
[...]
> @@ -359,17 +360,18 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
>  		die("Refusing to perform update with empty message.");
>  
>  	if (read_stdin) {
> -		int ret;
>  		transaction = ref_transaction_begin();
> -
> +		if (!transaction)
> +			die("failed to update refs");

This can't happen (xcalloc is defined to die() on malloc failure).
If you want to protect against it anyway, die("BUG: ...")?

Thanks,
Jonathan

  reply	other threads:[~2014-04-25 22:36 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-25 16:14 [PATCH v3 00/19] Use ref transactions from most callers Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 01/19] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 02/19] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 03/19] refs.c: make ref_transaction_commit return an error string Ronnie Sahlberg
2014-04-25 22:10   ` Jonathan Nieder
2014-04-28 17:46     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 04/19] refs.c: return error string from ref_update_reject_duplicates on failure Ronnie Sahlberg
2014-04-25 22:12   ` Jonathan Nieder
2014-04-28 18:23     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 05/19] update-ref.c: use the error string from _commit to print better message Ronnie Sahlberg
2014-04-25 22:36   ` Jonathan Nieder [this message]
2014-04-28 15:11     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 06/19] refs.c: make update_ref_write to return error string on failure Ronnie Sahlberg
2014-04-25 22:45   ` Jonathan Nieder
2014-04-28 18:23     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 07/19] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-04-25 22:47   ` Jonathan Nieder
2014-04-28 18:27     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 08/19] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 09/19] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 10/19] refs.c: ref_transaction_delete to check for error " Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 11/19] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-04-25 22:58   ` Michael Haggerty
2014-04-28 15:15     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 12/19] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-04-25 23:00   ` Michael Haggerty
2014-04-28 15:17     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 13/19] commit.c: use ref transactions " Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 14/19] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 15/19] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 16/19] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-04-25 23:16   ` Michael Haggerty
2014-04-28 19:16     ` Ronnie Sahlberg
2014-04-29  9:35       ` Michael Haggerty
2014-04-29 15:11         ` Ronnie Sahlberg
2014-04-29 17:15         ` Junio C Hamano
2014-04-25 16:14 ` [PATCH v3 17/19] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-04-25 23:28   ` Michael Haggerty
2014-04-28 18:33     ` Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 18/19] refs.c: free the transaction before returning when number of updates is 0 Ronnie Sahlberg
2014-04-25 16:14 ` [PATCH v3 19/19] refs.c: pass **transaction to commit and have it clear the pointer Ronnie Sahlberg
2014-04-26  1:31   ` Michael Haggerty
2014-04-28 17:59     ` Ronnie Sahlberg
2014-04-29  9:25       ` Michael Haggerty
2014-04-29 18:58         ` Ronnie Sahlberg
2014-04-30 14:20           ` Michael Haggerty
2014-04-25 21:53 ` [PATCH v3 00/19] Use ref transactions from most callers Jonathan Nieder
2014-04-25 22:04   ` Ronnie Sahlberg

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=20140425223620.GD9218@google.com \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    --cc=sahlberg@google.com \
    /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).