From f8621dde4057aba2df8d7585f6fbf2d6ee4fc023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Wed, 5 Feb 2014 10:42:42 +0100
Subject: [PATCH] refs: factor out old value comparison

We will reuse this later for deletion.
---
 src/refdb_fs.c | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index 879e48514..d1b20f8e3 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -930,6 +930,30 @@ static bool should_write_reflog(git_repository *repo, const char *name)
 	return 0;
 }
 
+static int cmp_old_ref(int *cmp, git_refdb_backend *backend, const git_reference *ref,
+	const git_oid *old_id, const char *old_target)
+{
+	int error = 0;
+	git_reference *old_ref = NULL;
+
+	*cmp = 0;
+	if (old_id || old_target) {
+		if ((error = refdb_fs_backend__lookup(&old_ref, backend, ref->name)) < 0)
+			goto out;
+	}
+
+	if (old_id && old_ref->type == GIT_REF_OID)
+		*cmp = git_oid_cmp(old_id, &old_ref->target.oid);
+
+	if (old_target && old_ref->type == GIT_REF_SYMBOLIC)
+		*cmp = git__strcmp(old_target, old_ref->target.symbolic);
+
+out:
+	git_reference_free(old_ref);
+
+	return error;
+}
+
 static int refdb_fs_backend__write(
 	git_refdb_backend *_backend,
 	const git_reference *ref,
@@ -954,20 +978,8 @@ static int refdb_fs_backend__write(
 	if ((error = loose_lock(&file, backend, ref)) < 0)
 		return error;
 
-	if (old_id || old_target) {
-		if ((error = refdb_fs_backend__lookup(&old_ref, _backend, ref->name)) < 0)
-			goto on_error;
-	}
-
-	if (old_id && old_ref->type == GIT_REF_OID) {
-		cmp = git_oid_cmp(old_id, &old_ref->target.oid);
-		git_reference_free(old_ref);
-	}
-
-	if (old_target && old_ref->type == GIT_REF_SYMBOLIC) {
-		cmp = git__strcmp(old_target, old_ref->target.symbolic);
-		git_reference_free(old_ref);
-	}
+	if ((error = cmp_old_ref(&cmp, _backend, ref, old_id, old_target)) < 0)
+		goto on_error;
 
 	if (cmp) {
 		giterr_set(GITERR_REFERENCE, "old reference value does not match");