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 v8 26/44] fast-import.c: use a ref transaction when dumping tags
Date: Tue, 20 May 2014 13:38:57 -0700	[thread overview]
Message-ID: <20140520203857.GS12314@google.com> (raw)
In-Reply-To: <1400174999-26786-27-git-send-email-sahlberg@google.com>

Ronnie Sahlberg wrote:

> [Subject: fast-import.c: use a ref transaction when dumping tags]

This seems like an odd thing to do: either it would make sense to have
a single transaction for all imported refs so all fail or succeed
together, or there would be separate transactions for each ref.

That said, I don't mind, particularly if it's a step on the way to
using a single transaction for everything being dumped.

[...]
> --- a/fast-import.c
> +++ b/fast-import.c
> @@ -1736,15 +1736,22 @@ static void dump_tags(void)
>  {
>  	static const char *msg = "fast-import";
>  	struct tag *t;
> -	struct ref_lock *lock;
>  	char ref_name[PATH_MAX];
> +	struct strbuf err = STRBUF_INIT;
> +	struct ref_transaction *transaction;
>  
> +	transaction = ref_transaction_begin();
>  	for (t = first_tag; t; t = t->next_tag) {
> -		sprintf(ref_name, "tags/%s", t->name);
> +		sprintf(ref_name, "refs/tags/%s", t->name);

Can this overflow the buffer?

> -		lock = lock_ref_sha1(ref_name, NULL);
> -		if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
> -			failure |= error("Unable to update %s", ref_name);
> +
> +		if (ref_transaction_update(transaction, ref_name, t->sha1,
> +					   NULL, 0, 0, &err)) {
> +			failure |= 1;
> +			break;
> +		}
>  	}
> +	if (failure || ref_transaction_commit(transaction, msg, &err))
> +		failure |= error("Unable to update %s", err.buf);

This 'if (failure || ...) failure |=' idiom seems strange.
Is err.buf always set if failure is nonzero?

Elsewhere failure is 0 or -1 but this introduces the possibility for
it to be temporarily 1.

dump_branches could have caused failure to be -1 before dump_tags
is called.  I think the intent is

		if (ref_transaction_update(...)) {
			failure |= error(...);
			goto out;
		}
	}
	if (ref_transaction_commit(...))
		failure |= error(...);
 out:
	ref_transaction_free(transaction);
	...

Thanks,
Jonathan

  reply	other threads:[~2014-05-20 20:39 UTC|newest]

Thread overview: 139+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-15 17:29 [PATCH v8 00/44] Use ref transactions for all ref updates Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 01/44] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-05-15 18:10   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 02/44] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-05-15 18:15   ` Jonathan Nieder
2014-05-15 18:26     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 03/44] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 04/44] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-05-15 18:38   ` Jonathan Nieder
2014-05-15 23:06     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 05/44] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 06/44] refs.c: add an err argument ro delete_loose_ref Ronnie Sahlberg
2014-05-15 19:04   ` Jonathan Nieder
2014-05-15 20:00     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 07/44] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 08/44] update-ref.c: log transaction error from the update_ref Ronnie Sahlberg
2014-05-15 19:23   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 09/44] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 10/44] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-05-15 19:34   ` Jonathan Nieder
2014-05-15 22:09     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 11/44] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-05-15 19:44   ` Jonathan Nieder
2014-05-15 22:02     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 12/44] refs.c: ref_transaction_delete to check for error " Ronnie Sahlberg
2014-05-15 19:51   ` Jonathan Nieder
2014-05-15 22:01     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 13/44] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-05-15 21:11   ` Jonathan Nieder
2014-05-15 22:27     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 14/44] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-05-15 21:18   ` Jonathan Nieder
2014-05-15 22:30     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 15/44] commit.c: use ref transactions " Ronnie Sahlberg
2014-05-15 21:21   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 16/44] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-05-15 21:53   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 17/44] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-05-15 21:47   ` Jonathan Nieder
2014-05-15 22:20     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 18/44] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-05-15 22:58   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 19/44] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-05-15 23:16   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 20/44] refs.c: free the transaction before returning when number of updates is 0 Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 21/44] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-05-16  0:20   ` Jonathan Nieder
2014-05-16 15:02     ` Ronnie Sahlberg
2014-05-16 15:15       ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 22/44] fetch.c: clear errno before calling functions that might set it Ronnie Sahlberg
2014-05-16 18:33   ` Jonathan Nieder
2014-05-16 20:26     ` Ronnie Sahlberg
2014-05-16 23:04     ` Jeff King
2014-05-15 17:29 ` [PATCH v8 23/44] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-05-16 19:12   ` Jonathan Nieder
2014-05-16 22:22     ` Ronnie Sahlberg
2014-05-16 22:54   ` Jonathan Nieder
2014-05-19 16:58     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 24/44] fetch.c: use a single ref transaction for all ref updates Ronnie Sahlberg
2014-05-16 22:52   ` Jonathan Nieder
2014-05-19 16:56     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 25/44] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-05-20 19:42   ` Jonathan Nieder
2014-05-20 20:37     ` Ronnie Sahlberg
2014-05-21 18:50       ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 26/44] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-05-20 20:38   ` Jonathan Nieder [this message]
2014-05-20 20:53     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 27/44] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-05-21  0:46   ` Jonathan Nieder
2014-05-21 17:06     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 28/44] refs.c: make write_ref_sha1 static Ronnie Sahlberg
2014-05-21  0:51   ` Jonathan Nieder
2014-05-21 14:46     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 29/44] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-05-21  0:52   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 30/44] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-05-21 22:00   ` Jonathan Nieder
2014-05-21 22:11     ` Ronnie Sahlberg
2014-05-21 22:22       ` Jonathan Nieder
2014-05-22 17:15         ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 31/44] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-05-21 22:01   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 32/44] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-05-21 22:07   ` Jonathan Nieder
2014-05-22 16:49     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 33/44] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-05-21 22:09   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 34/44] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-05-21 23:01   ` Jonathan Nieder
2014-05-22 16:56     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 35/44] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-05-21 23:22   ` Jonathan Nieder
2014-05-22 15:32     ` Ronnie Sahlberg
2014-05-22 16:31       ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 36/44] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-05-21 23:47   ` Jonathan Nieder
2014-05-22 15:40     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 37/44] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-05-21 23:50   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 38/44] refs.c: pack all refs before we start to rename a ref Ronnie Sahlberg
2014-05-21 23:57   ` Jonathan Nieder
2014-05-22 15:50     ` Ronnie Sahlberg
2014-05-22 17:51       ` Jonathan Nieder
2014-05-22 18:02         ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 39/44] refs.c: move the check for valid refname to lock_ref_sha1_basic Ronnie Sahlberg
2014-05-22  1:42   ` Jonathan Nieder
2014-05-22 17:28     ` Ronnie Sahlberg
2014-05-22 17:44       ` Jonathan Nieder
2014-05-22 17:57         ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 40/44] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-05-22 17:53   ` Jonathan Nieder
2014-05-15 17:29 ` [PATCH v8 41/44] refs.c: add a new flag for transaction delete for refs we know are packed only Ronnie Sahlberg
2014-05-22 18:17   ` Jonathan Nieder
2014-05-22 19:12     ` Ronnie Sahlberg
2014-05-22 22:53       ` Ronnie Sahlberg
2014-05-22 23:44         ` Jonathan Nieder
2014-05-22 23:53           ` Jonathan Nieder
2014-05-23 14:59             ` Ronnie Sahlberg
2014-05-23 18:24               ` Jonathan Nieder
2014-05-23 15:23   ` Michael Haggerty
2014-05-23 15:53     ` Jonathan Nieder
2014-05-23 21:45       ` Michael Haggerty
2014-05-27 18:27     ` Junio C Hamano
2014-05-28 14:21       ` Michael Haggerty
2014-05-28 16:58         ` Junio C Hamano
2014-05-28 22:23           ` Michael Haggerty
2014-05-15 17:29 ` [PATCH v8 42/44] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-05-22 19:27   ` Jonathan Nieder
2014-05-27 18:37     ` Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 43/44] refs.c: make rename_ref use a transaction Ronnie Sahlberg
2014-05-15 17:29 ` [PATCH v8 44/44] refs.c: remove forward declaration of write_ref_sha1 Ronnie Sahlberg
2014-05-15 18:06 ` [PATCH v8 00/44] Use ref transactions for all ref updates Jonathan Nieder
2014-05-15 18:51   ` Junio C Hamano
2014-05-22 19:51 ` Jonathan Nieder
2014-05-22 19:58 ` Jonathan Nieder
2014-05-22 22:08 ` Jonathan Nieder
2014-05-22 23:08 ` Jonathan Nieder
2014-05-27 19:05   ` 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=20140520203857.GS12314@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).