git/refs, branch v2.9.2

Merge branch 'dt/pre-refs-backend'

2016-04-25T22:17:15Z

Code restructuring around the "refs" area to prepare for pluggable refs backends. * dt/pre-refs-backend: (24 commits) refs: on symref reflog expire, lock symref not referrent refs: move resolve_ref_unsafe into common code show_head_ref(): check the result of resolve_ref_namespace() check_aliased_update(): check that dst_name is non-NULL checkout_paths(): remove unneeded flag variable cmd_merge(): remove unneeded flag variable fsck_head_link(): remove unneeded flag variable read_raw_ref(): change flags parameter to unsigned int files-backend: inline resolve_ref_1() into resolve_ref_unsafe() read_raw_ref(): manage own scratch space files-backend: break out ref reading resolve_ref_1(): eliminate local variable "bad_name" resolve_ref_1(): reorder code resolve_ref_1(): eliminate local variable resolve_ref_unsafe(): ensure flags is always set resolve_ref_unsafe(): use for loop to count up to MAXDEPTH resolve_missing_loose_ref(): simplify semantics t1430: improve test coverage of deletion of badly-named refs t1430: test for-each-ref in the presence of badly-named refs t1430: don't rely on symbolic-ref for creating broken symrefs ...

refs: on symref reflog expire, lock symref not referrent

2016-04-10T18:35:46Z

When locking a symbolic ref to expire a reflog, lock the symbolic ref (using REF_NODEREF) instead of its referent. Add a test for this. Signed-off-by: David Turner Reviewed-by: Michael Haggerty Signed-off-by: Junio C Hamano

refs: move resolve_ref_unsafe into common code

2016-04-10T18:35:41Z

Now that resolve_ref_unsafe's only interaction with the backend is through read_raw_ref, we can move it into the common code. Later, we'll replace read_raw_ref with a backend function. Signed-off-by: David Turner Reviewed-by: Michael Haggerty Signed-off-by: Junio C Hamano

read_raw_ref(): change flags parameter to unsigned int

2016-04-10T18:35:31Z

read_raw_ref() is going to be part of the vtable for reference backends, so clean up its interface to use "unsigned int flags" rather than "int flags". Its caller still uses signed int for its flags arguments. But changing that would touch a lot of code, so leave it for now. Signed-off-by: Michael Haggerty Signed-off-by: David Turner Signed-off-by: Junio C Hamano

files-backend: inline resolve_ref_1() into resolve_ref_unsafe()

2016-04-10T18:35:29Z

resolve_ref_unsafe() wasn't doing anything useful anymore. Signed-off-by: Michael Haggerty Signed-off-by: David Turner Signed-off-by: Junio C Hamano

read_raw_ref(): manage own scratch space

2016-04-10T18:35:26Z

Instead of creating scratch space in resolve_ref_unsafe() and passing it down through resolve_ref_1 to read_raw_ref(), teach read_raw_ref() to manage its own scratch space. This reduces coupling across the functions at the cost of some extra allocations. Also, when read_raw_ref() is implemented for different reference backends, the other implementations might have different scratch space requirements. Note that we now preserve errno across the calls to strbuf_release(), which calls free() and can thus theoretically overwrite errno. Signed-off-by: Michael Haggerty Signed-off-by: David Turner Signed-off-by: Junio C Hamano

files-backend: break out ref reading

2016-04-10T18:35:24Z

Refactor resolve_ref_1 in terms of a new function read_raw_ref, which is responsible for reading ref data from the ref storage. Later, we will make read_raw_ref a pluggable backend function, and make resolve_ref_unsafe common. Signed-off-by: David Turner Helped-by: Duy Nguyen Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

resolve_ref_1(): eliminate local variable "bad_name"

2016-04-10T18:35:22Z

We can use (*flags & REF_BAD_NAME) for that purpose. Signed-off-by: Michael Haggerty Signed-off-by: David Turner Signed-off-by: Junio C Hamano

resolve_ref_1(): reorder code

2016-04-10T18:35:21Z

There is no need to adjust *flags if we're just about to fail. Signed-off-by: Michael Haggerty Signed-off-by: David Turner Signed-off-by: Junio C Hamano

resolve_ref_1(): eliminate local variable

2016-04-10T18:35:19Z

In place of `buf`, use `refname`, which is anyway a better description of what is being pointed at. Signed-off-by: Michael Haggerty Signed-off-by: David Turner Signed-off-by: Junio C Hamano