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 
That was the last caller, so delete function write_ref_sha1().

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-09 17:29:20 +02:00 committed by Junio C Hamano
parent ba43b7f29c
commit 61e51e0000
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
refs.c
View File

@ -3108,21 +3108,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 (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)
{
@ -3816,9 +3801,13 @@ int ref_transaction_commit(struct ref_transaction *transaction,
*/
unlock_ref(update->lock);
update->lock = NULL;
} else if (write_ref_sha1(update->lock, update->new_sha1,
update->msg)) {
update->lock = NULL; /* freed by write_ref_sha1 */
} else if (write_ref_to_lockfile(update->lock,
update->new_sha1) ||
commit_ref_update(update->lock,
update->new_sha1,
update->msg)) {
/* freed by one of the above calls: */
update->lock = NULL;
strbuf_addf(err, "Cannot update the ref '%s'.",
update->refname);
ret = TRANSACTION_GENERIC_ERROR;