mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
refs.c: remove the update_ref_lock function
Since we now only call update_ref_lock with onerr==QUIET_ON_ERR we no longer need this function and can replace it with just calling lock_any_ref_for_update directly. Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
88b680ae8d
commit
45421e24e8
30
refs.c
30
refs.c
|
@ -3336,24 +3336,6 @@ int for_each_reflog(each_ref_fn fn, void *cb_data)
|
|||
return retval;
|
||||
}
|
||||
|
||||
static struct ref_lock *update_ref_lock(const char *refname,
|
||||
const unsigned char *oldval,
|
||||
int flags, int *type_p,
|
||||
enum action_on_err onerr)
|
||||
{
|
||||
struct ref_lock *lock;
|
||||
lock = lock_any_ref_for_update(refname, oldval, flags, type_p);
|
||||
if (!lock) {
|
||||
const char *str = "Cannot lock the ref '%s'.";
|
||||
switch (onerr) {
|
||||
case UPDATE_REFS_MSG_ON_ERR: error(str, refname); break;
|
||||
case UPDATE_REFS_DIE_ON_ERR: die(str, refname); break;
|
||||
case UPDATE_REFS_QUIET_ON_ERR: break;
|
||||
}
|
||||
}
|
||||
return lock;
|
||||
}
|
||||
|
||||
static int update_ref_write(const char *action, const char *refname,
|
||||
const unsigned char *sha1, struct ref_lock *lock,
|
||||
struct strbuf *err, enum action_on_err onerr)
|
||||
|
@ -3603,12 +3585,12 @@ int ref_transaction_commit(struct ref_transaction *transaction,
|
|||
for (i = 0; i < n; i++) {
|
||||
struct ref_update *update = updates[i];
|
||||
|
||||
update->lock = update_ref_lock(update->refname,
|
||||
(update->have_old ?
|
||||
update->old_sha1 : NULL),
|
||||
update->flags,
|
||||
&update->type,
|
||||
UPDATE_REFS_QUIET_ON_ERR);
|
||||
update->lock = lock_any_ref_for_update(update->refname,
|
||||
(update->have_old ?
|
||||
update->old_sha1 :
|
||||
NULL),
|
||||
update->flags,
|
||||
&update->type);
|
||||
if (!update->lock) {
|
||||
if (err)
|
||||
strbuf_addf(err, "Cannot lock the ref '%s'.",
|
||||
|
|
Loading…
Reference in a new issue