Skip to content

Commit

Permalink
refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
Browse files Browse the repository at this point in the history
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ronnie Sahlberg authored and Junio C Hamano committed Dec 4, 2014
1 parent bc9f292 commit a785d3f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
22 changes: 2 additions & 20 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion refs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit a785d3f

Please sign in to comment.