diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-04-24 13:35:45 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-04-25 23:06:26 -0700 |
commit | 2af510f67b7de1f0811da548eac8938ffef1b92f (patch) | |
tree | b4349a4995d8564065c0df754e5a4d6adab0525b | |
parent | c1f0ca9994b9e323e5dec830822c0e30ee2b02cd (diff) | |
download | git-2af510f67b7de1f0811da548eac8938ffef1b92f.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>
-rw-r--r-- | refs.c | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -3017,11 +3017,10 @@ 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; @@ -3050,6 +3049,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) && |