From: Ronnie Sahlberg Date: Wed, 14 May 2014 22:13:00 GMT Subject: [PATCH 01/31] refs.c make ref_transaction_create a wrapper to ref_transaction_update Message-ID: <1400105610-21194-2-git-send-email-sahlberg@google.com> In-Reply-To: <1400105610-21194-1-git-send-email-sahlberg@google.com> Signed-off-by: Ronnie Sahlberg --- refs.c | 13 +++---------- refs.h | 7 ++++--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/refs.c b/refs.c index aed700b..fe195dd 100644 --- a/refs.c +++ b/refs.c @@ -3354,17 +3354,10 @@ int ref_transaction_create(struct ref_transaction *transaction, die("BUG: create on transaction that is not open"); if (flags & REF_ISPACKONLY) - die("BUG: REF_ISPACKONLY can not be used with creates"); + die("BUG: REF_ISPACKONLY can not be used with create"); - update = add_update(transaction, refname); - - hashcpy(update->new_sha1, new_sha1); - hashclr(update->old_sha1); - update->flags = flags; - update->have_old = 1; - if (msg) - update->msg = xstrdup(msg); - return 0; + return ref_transaction_update(transaction, refname, new_sha1, + null_sha1, flags, 1, msg); } int ref_transaction_delete(struct ref_transaction *transaction, diff --git a/refs.h b/refs.h index 2d2362c..d615871 100644 --- a/refs.h +++ b/refs.h @@ -233,9 +233,10 @@ void ref_transaction_rollback(struct ref_transaction *transaction); /* * Add a reference update to transaction. new_sha1 is the value that * the reference should have after the update, or zeros 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. + * be deleted. If have_old is true and old_sha is not the null_sha1 + * then the previous value of the ref must match or the update will fail. + * If have_old is true and old_sha1 is the null_sha1 then the ref must not + * already exist and a new ref will be created with new_sha1. * Function returns 0 on success and non-zero on failure. */ int ref_transaction_update(struct ref_transaction *transaction, -- 2.0.0.rc3.506.g3739a35