undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit_ref_update(): new function, extracted from write_ref_sha1()

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2015-05-10 04:45:33 +02:00 committed by Junio C Hamano
parent 1d455231a0
commit 38e50e81e3
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
refs.c
View File

@ -3085,24 +3085,13 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
} }
/* /*
* Write sha1 into the ref specified by the lock. Make sure that errno * Commit a change to a loose reference that has already been written
* is sane on error. * to the loose reference lockfile. Also update the reflogs if
* necessary, using the specified lockmsg (which can be NULL).
*/ */
static int write_ref_sha1(struct ref_lock *lock, static int commit_ref_update(struct ref_lock *lock,
const unsigned char *sha1, const char *logmsg) const unsigned char *sha1, const char *logmsg)
{ {
if (!lock) {
errno = EINVAL;
return -1;
}
if (!lock->force_write && !hashcmp(lock->old_sha1, sha1)) {
unlock_ref(lock);
return 0;
}
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) &&
@ -3141,6 +3130,30 @@ static int write_ref_sha1(struct ref_lock *lock,
return 0; 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 (!lock) {
errno = EINVAL;
return -1;
}
if (!lock->force_write && !hashcmp(lock->old_sha1, sha1)) {
unlock_ref(lock);
return 0;
}
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, int create_symref(const char *ref_target, const char *refs_heads_master,
const char *logmsg) const char *logmsg)
{ {