From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jul 2016 21:13:32 +0000 (-0700)
Subject: Merge branch 'mh/split-under-lock'
X-Git-Tag: v2.10.0-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b34ce90a748ff6bd679c29bc3f37a75a1bd3441

Merge branch 'mh/split-under-lock'

Further preparatory work on the refs API before the pluggable
backend series can land.

* mh/split-under-lock: (33 commits)
lock_ref_sha1_basic(): only handle REF_NODEREF mode
commit_ref_update(): remove the flags parameter
lock_ref_for_update(): don't resolve symrefs
lock_ref_for_update(): don't re-read non-symbolic references
refs: resolve symbolic refs first
ref_transaction_update(): check refname_is_safe() at a minimum
unlock_ref(): move definition higher in the file
lock_ref_for_update(): new function
add_update(): initialize the whole ref_update
verify_refname_available(): adjust constness in declaration
refs: don't dereference on rename
refs: allow log-only updates
delete_branches(): use resolve_refdup()
ref_transaction_commit(): correctly report close_ref() failure
ref_transaction_create(): disallow recursive pruning
refs: make error messages more consistent
lock_ref_sha1_basic(): remove unneeded local variable
read_raw_ref(): move docstring to header file
read_raw_ref(): improve docstring
read_raw_ref(): rename symref argument to referent
...
---

6b34ce90a748ff6bd679c29bc3f37a75a1bd3441
diff --cc refs/files-backend.c
index dac3a22297,bbf96ad83a..4dd72b42c8
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@@ -1730,9 -1934,9 +1934,9 @@@ static int verify_lock(struct ref_lock 
  		}
  	}
  	if (old_sha1 && hashcmp(lock->old_oid.hash, old_sha1)) {
- 		strbuf_addf(err, "ref %s is at %s but expected %s",
+ 		strbuf_addf(err, "ref '%s' is at %s but expected %s",
  			    lock->ref_name,
 -			    sha1_to_hex(lock->old_oid.hash),
 +			    oid_to_hex(&lock->old_oid),
  			    sha1_to_hex(old_sha1));
  		errno = EBUSY;
  		return -1;