git/refs.c, branch v2.5.2

Merge branch 'mh/reporting-broken-refs-from-for-each-ref'

2015-06-24T19:21:52Z

"git for-each-ref" reported "missing object" for 0{40} when it encounters a broken ref. The lack of object whose name is 0{40} is not the problem; the ref being broken is. * mh/reporting-broken-refs-from-for-each-ref: read_loose_refs(): treat NULL_SHA1 loose references as broken read_loose_refs(): simplify function logic for-each-ref: report broken references correctly t6301: new tests of for-each-ref error handling

Merge branch 'mh/verify-lock-error-report'

2015-06-11T16:29:54Z

Bring consistency to error reporting mechanism used in "refs" API. * mh/verify-lock-error-report: ref_transaction_commit(): do not capitalize error messages verify_lock(): do not capitalize error messages verify_lock(): report errors via a strbuf verify_lock(): on errors, let the caller unlock the lock verify_lock(): return 0/-1 rather than struct ref_lock *

read_loose_refs(): treat NULL_SHA1 loose references as broken

2015-06-08T17:35:41Z

NULL_SHA1 is used to indicate an "invalid object name" throughout our code (and the code of other git implementations), so it is vastly more likely that an on-disk reference was set to this value due to a software bug than that NULL_SHA1 is the legitimate SHA-1 of an actual object. Therefore, if a loose reference has the value NULL_SHA1, consider it to be broken. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

read_loose_refs(): simplify function logic

2015-06-03T18:44:25Z

Make it clearer that there are two possible ways to read the reference, but that we handle read errors uniformly regardless of which way it was read. This refactoring also makes the following change easier to implement. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

ref_transaction_commit(): do not capitalize error messages

2015-05-27T22:58:42Z

Our convention is for error messages to start with a lower-case letter. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

verify_lock(): do not capitalize error messages

2015-05-27T22:58:42Z

Our convention is for error messages to start with a lower-case letter. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

verify_lock(): report errors via a strbuf

2015-05-27T22:57:47Z

Instead of writing error messages directly to stderr, write them to a "strbuf *err". The caller, lock_ref_sha1_basic(), uses this error reporting convention with all the other callees, and reports its error this way to its callers. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

verify_lock(): on errors, let the caller unlock the lock

2015-05-27T19:40:29Z

The caller already knows how to do it, so always do it in the same place. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

verify_lock(): return 0/-1 rather than struct ref_lock *

2015-05-27T19:39:41Z

Its return value wasn't conveying any extra information, but it made the reader wonder whether the ref_lock that it returned might be different than the one that was passed to it. So change the function to the traditional "return 0 on success or a negative value on error". Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

struct ref_lock: convert old_sha1 member to object_id

2015-05-25T19:19:40Z

Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano