summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-04-24 13:35:45 +0200
committerJunio C Hamano <gitster@pobox.com>2015-05-12 21:28:02 -0700
commite6fd3c67308cb388effba646b52b7ba461ce79a7 (patch)
tree092367fae74a19c7f7041778f58403a70b382c23 /refs.c
parentfc38a9bb4df39ba60573583472d4ecfab1807e90 (diff)
downloadgit-e6fd3c67308cb388effba646b52b7ba461ce79a7.tar.gz
write_ref_to_lockfile(): new function, extracted from write_ref_sha1()
This is the first step towards separating the checking and writing of the new reference value to committing the change. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/refs.c b/refs.c
index 47e4e5380a..f94682a0b6 100644
--- a/refs.c
+++ b/refs.c
@@ -3022,11 +3022,11 @@ int is_branch(const char *refname)
}
/*
- * Write sha1 into the ref specified by the lock. Make sure that errno
- * is sane on error.
+ * Write sha1 into the open lockfile, then close the lockfile. On
+ * errors, rollback the lockfile and set errno to reflect the problem.
*/
-static int write_ref_sha1(struct ref_lock *lock,
- const unsigned char *sha1, const char *logmsg)
+static int write_ref_to_lockfile(struct ref_lock *lock,
+ const unsigned char *sha1)
{
static char term = '\n';
struct object *o;
@@ -3055,6 +3055,19 @@ static int write_ref_sha1(struct ref_lock *lock,
errno = save_errno;
return -1;
}
+ 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)
+{
+ 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) &&