From: Junio C Hamano <gitster@pobox.com>
To: Ronnie Sahlberg <sahlberg@google.com>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
Date: Thu, 23 Oct 2014 10:43:04 -0700 [thread overview]
Message-ID: <xmqqtx2usmvr.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1413919462-3458-3-git-send-email-sahlberg@google.com> (Ronnie Sahlberg's message of "Tue, 21 Oct 2014 12:24:09 -0700")
Ronnie Sahlberg <sahlberg@google.com> writes:
> commit 0beeda259297c92d411ecc92fa508ec7cfd87cc5 upstream.
>
> Change-Id: I685291986e544a8dc14f94c73b6a7c6400acd9d2
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> refs.c | 22 ++--------------------
> refs.h | 2 +-
> 2 files changed, 3 insertions(+), 21 deletions(-)
Nice code reduction.
>
> diff --git a/refs.c b/refs.c
> index ed0485e..c607ab7 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3633,26 +3633,8 @@ int ref_transaction_delete(struct ref_transaction *transaction,
> int flags, int have_old, const char *msg,
> struct strbuf *err)
> {
> - struct ref_update *update;
> -
> - assert(err);
> -
> - if (transaction->state != REF_TRANSACTION_OPEN)
> - die("BUG: delete called for transaction that is not open");
> -
> - if (have_old && !old_sha1)
> - die("BUG: have_old is true but old_sha1 is NULL");
> -
> - update = add_update(transaction, refname);
> - update->flags = flags;
> - update->have_old = have_old;
> - if (have_old) {
> - assert(!is_null_sha1(old_sha1));
> - hashcpy(update->old_sha1, old_sha1);
> - }
> - if (msg)
> - update->msg = xstrdup(msg);
> - return 0;
> + return ref_transaction_update(transaction, refname, null_sha1,
> + old_sha1, flags, have_old, msg, err);
> }
>
> int update_ref(const char *action, const char *refname,
> diff --git a/refs.h b/refs.h
> index 2bc3556..7d675b7 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -283,7 +283,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
>
> /*
> * Add a reference update to transaction. new_sha1 is the value that
> - * the reference should have after the update, or zeros if it should
> + * the reference should have after the update, or null_sha1 if it should
> * be deleted. If have_old is true, then old_sha1 holds the value
> * that the reference should have had before the update, or zeros if
> * it must not have existed beforehand.
next prev parent reply other threads:[~2014-10-23 17:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 19:24 [PATCH 00/15] ref-transactions-reflog Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 01/15] refs.c make ref_transaction_create a wrapper to ref_transaction_update Ronnie Sahlberg
2014-10-23 17:42 ` Junio C Hamano
2014-10-23 17:44 ` Ronnie Sahlberg
2014-10-23 17:54 ` Junio C Hamano
2014-10-28 18:40 ` Junio C Hamano
2014-10-21 19:24 ` [PATCH 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update Ronnie Sahlberg
2014-10-23 17:43 ` Junio C Hamano [this message]
2014-10-21 19:24 ` [PATCH 03/15] refs.c: rename the transaction functions Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 04/15] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-10-23 17:47 ` Junio C Hamano
2014-10-21 19:24 ` [PATCH 05/15] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 06/15] copy.c: make copy_fd preserve meaningful errno Ronnie Sahlberg
2014-10-23 17:51 ` Junio C Hamano
2014-10-23 17:54 ` Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 07/15] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 08/15] refs.c: add a flag to allow reflog updates to truncate the log Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 09/15] refs.c: only write reflog update if msg is non-NULL Ronnie Sahlberg
2014-10-23 18:32 ` Junio C Hamano
2014-10-28 19:17 ` Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 10/15] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-10-23 18:54 ` Junio C Hamano
2014-10-28 19:59 ` Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 11/15] reflog.c: use a reflog transaction when writing during expire Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 12/15] refs.c: rename log_ref_setup to create_reflog Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 13/15] refs.c: make unlock_ref/close_ref/commit_ref static Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 14/15] refs.c: remove lock_any_ref_for_update Ronnie Sahlberg
2014-10-21 19:24 ` [PATCH 15/15] refs.c: allow deleting refs with a broken sha1 Ronnie Sahlberg
-- strict thread matches above, loose matches on Subject: below --
2014-07-23 17:03 [PATCH 00/15] ref-transactions for reflogs Ronnie Sahlberg
2014-07-23 17:03 ` [PATCH 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update 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=xmqqtx2usmvr.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.