Ronnie Sahlberg <sahlb...@google.com> writes:
> commit 0beeda259297c92d411ecc92fa508ec7cfd87cc5 upstream.
>
> Change-Id: I685291986e544a8dc14f94c73b6a7c6400acd9d2
> Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
> Signed-off-by: Jonathan Nieder <jrnie...@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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
