From 841caad903f2b160e9f5ff05f961d20ad9085ddc Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Tue, 7 Jun 2016 09:32:08 +0200 Subject: lock_ref_for_update(): avoid a symref resolution If we're overwriting a symref with a SHA-1, we need to resolve the value of the symref (1) to check against update->old_sha1 and (2) to write to its reflog. However, we've already read the symref itself and know its referent. So there is no need to read the symref's value through the symref; we can read the referent directly. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- refs/files-backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index 6f8fecd024..769e5c4100 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -3479,7 +3479,7 @@ static int lock_ref_for_update(struct ref_update *update, * the transaction, so we have to read it here * to record and possibly check old_sha1: */ - if (read_ref_full(update->refname, 0, + if (read_ref_full(referent.buf, 0, lock->old_oid.hash, NULL)) { if (update->flags & REF_HAVE_OLD) { strbuf_addf(err, "cannot lock ref '%s': " -- cgit v1.2.3