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

ref_transaction_commit(): inline call to write_ref_sha1()

Browse Source 
And remove the function write_ref_sha1(), as it is no longer used.

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:35 +02:00 committed by Junio C Hamano
parent 29957fda0b
commit 4da50def5b
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
refs.c
View File

@ -3134,30 +3134,6 @@ static int commit_ref_update(struct ref_lock *lock,
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,
const char *logmsg)
{
@ -3852,15 +3828,21 @@ int ref_transaction_commit(struct ref_transaction *transaction,
struct ref_update *update = updates[i];
if (!is_null_sha1(update->new_sha1)) {
if (write_ref_sha1(update->lock, update->new_sha1,
update->msg)) {
update->lock = NULL; /* freed by write_ref_sha1 */
if (!update->lock->force_write &&
!hashcmp(update->lock->old_sha1, update->new_sha1)) {
unlock_ref(update->lock);
update->lock = NULL;
} else if (write_ref_to_lockfile(update->lock, update->new_sha1) ||
commit_ref_update(update->lock, update->new_sha1, update->msg)) {
update->lock = NULL; /* freed by the above calls */
strbuf_addf(err, "Cannot update the ref '%s'.",
update->refname);
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
} else {
/* freed by the above calls: */
update->lock = NULL;
}
update->lock = NULL; /* freed by write_ref_sha1 */
}
}