diff options
author | Ronnie Sahlberg <sahlberg@google.com> | 2014-11-19 13:40:24 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-20 09:26:45 -0800 |
commit | eb606f437007d4a2aefef25312a3aebdcfed0893 (patch) | |
tree | 5833ce668f70a0641462395b66fb2df00bd7ac35 | |
parent | 387977eaebdad265f6f05825cc28296e0f118451 (diff) | |
download | git-sb/ref-transaction-unify-to-update.tar.gz |
refs.c: make ref_transaction_delete a wrapper for ref_transaction_updatesb/ref-transaction-unify-to-update
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | refs.c | 22 | ||||
-rw-r--r-- | refs.h | 2 |
2 files changed, 3 insertions, 21 deletions
@@ -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, @@ -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. |