From: Michael Haggerty Date: Fri, 24 Apr 2015 11:35:46 GMT Subject: [PATCH 2/5] commit_ref_update(): new function, extracted from write_ref_sha1() Message-ID: <1429875349-29736-3-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1429875349-29736-1-git-send-email-mhagger@alum.mit.edu> Signed-off-by: Michael Haggerty --- refs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index 72dae21..9b68aec 100644 --- a/refs.c +++ b/refs.c @@ -3052,16 +3052,9 @@ static int write_ref_to_lockfile(struct ref_lock *lock, const unsigned char *sha return 0; } -/* - * Write sha1 into the ref specified by the lock. Make sure that errno - * is sane on error. - */ -static int write_ref_sha1(struct ref_lock *lock, - const unsigned char *sha1, const char *logmsg) +static int commit_ref_update(struct ref_lock *lock, + const unsigned char *sha1, const char *logmsg) { - if (write_ref_to_lockfile(lock, sha1)) - return -1; - clear_loose_ref_cache(&ref_cache); if (log_ref_write(lock->ref_name, lock->old_sha1, sha1, logmsg) < 0 || (strcmp(lock->ref_name, lock->orig_ref_name) && @@ -3100,6 +3093,21 @@ static int write_ref_sha1(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) { -- 2.1.4