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>maint
parent
fc38a9bb4d
commit
e6fd3c6730
21
refs.c
21
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
|
* Write sha1 into the open lockfile, then close the lockfile. On
|
||||||
* is sane on error.
|
* errors, rollback the lockfile and set errno to reflect the problem.
|
||||||
*/
|
*/
|
||||||
static int write_ref_sha1(struct ref_lock *lock,
|
static int write_ref_to_lockfile(struct ref_lock *lock,
|
||||||
const unsigned char *sha1, const char *logmsg)
|
const unsigned char *sha1)
|
||||||
{
|
{
|
||||||
static char term = '\n';
|
static char term = '\n';
|
||||||
struct object *o;
|
struct object *o;
|
||||||
|
@ -3055,6 +3055,19 @@ static int write_ref_sha1(struct ref_lock *lock,
|
||||||
errno = save_errno;
|
errno = save_errno;
|
||||||
return -1;
|
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);
|
clear_loose_ref_cache(&ref_cache);
|
||||||
if (log_ref_write(lock->ref_name, lock->old_sha1, sha1, logmsg) < 0 ||
|
if (log_ref_write(lock->ref_name, lock->old_sha1, sha1, logmsg) < 0 ||
|
||||||
(strcmp(lock->ref_name, lock->orig_ref_name) &&
|
(strcmp(lock->ref_name, lock->orig_ref_name) &&
|
||||||
|
|
Loading…
Reference in New Issue