From 61e51e0000073b684eaf5393ae2229f4f62f35c9 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sat, 9 May 2015 17:29:20 +0200 Subject: [PATCH] ref_transaction_commit(): inline call to write_ref_sha1() That was the last caller, so delete function write_ref_sha1(). Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- refs.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/refs.c b/refs.c index ad4b6d520..6cb1476c3 100644 --- a/refs.c +++ b/refs.c @@ -3108,21 +3108,6 @@ static int commit_ref_update(struct ref_lock *lock, return 0; } -/* - * Write sha1 as the new value of the reference specified by the - * (open) lock. On error, roll back the lockfile and set errno - * appropriately. - */ -static int write_ref_sha1(struct ref_lock *lock, - const unsigned char *sha1, const char *logmsg) -{ - if (write_ref_to_lockfile(lock, sha1) || - commit_ref_update(lock, sha1, logmsg)) - return -1; - - return 0; -} - int create_symref(const char *ref_target, const char *refs_heads_master, const char *logmsg) { @@ -3816,9 +3801,13 @@ int ref_transaction_commit(struct ref_transaction *transaction, */ unlock_ref(update->lock); update->lock = NULL; - } else if (write_ref_sha1(update->lock, update->new_sha1, - update->msg)) { - update->lock = NULL; /* freed by write_ref_sha1 */ + } else if (write_ref_to_lockfile(update->lock, + update->new_sha1) || + commit_ref_update(update->lock, + update->new_sha1, + update->msg)) { + /* freed by one of the above calls: */ + update->lock = NULL; strbuf_addf(err, "Cannot update the ref '%s'.", update->refname); ret = TRANSACTION_GENERIC_ERROR; -- 2.11.0