undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

verify_lock(): report errors via a strbuf

Browse Source 
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 <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2015-05-23 01:34:55 +02:00 committed by Junio C Hamano
parent f41d632970
commit 33ffc176d6
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
refs.c
View File

@ -2221,23 +2221,28 @@ static void unlock_ref(struct ref_lock *lock)
/* /*
* Verify that the reference locked by lock has the value old_sha1. * Verify that the reference locked by lock has the value old_sha1.
* Fail if the reference doesn't exist and mustexist is set. Return 0 * Fail if the reference doesn't exist and mustexist is set. Return 0
* on success or a negative value on error. This function should make * on success. On error, write an error message to err, set errno, and
* sure errno is meaningful on error. * return a negative value.
*/ */
static int verify_lock(struct ref_lock *lock, static int verify_lock(struct ref_lock *lock,
const unsigned char *old_sha1, int mustexist) const unsigned char *old_sha1, int mustexist,
struct strbuf *err)
{ {
assert(err);
if (read_ref_full(lock->ref_name, if (read_ref_full(lock->ref_name,
mustexist ? RESOLVE_REF_READING : 0, mustexist ? RESOLVE_REF_READING : 0,
lock->old_sha1, NULL)) { lock->old_sha1, NULL)) {
int save_errno = errno; int save_errno = errno;
error("Can't verify ref %s", lock->ref_name); strbuf_addf(err, "Can't verify ref %s", lock->ref_name);
errno = save_errno; errno = save_errno;
return -1; return -1;
} }
if (hashcmp(lock->old_sha1, old_sha1)) { if (hashcmp(lock->old_sha1, old_sha1)) {
error("Ref %s is at %s but expected %s", lock->ref_name, strbuf_addf(err, "Ref %s is at %s but expected %s",
sha1_to_hex(lock->old_sha1), sha1_to_hex(old_sha1)); lock->ref_name,
sha1_to_hex(lock->old_sha1),
sha1_to_hex(old_sha1));
errno = EBUSY; errno = EBUSY;
return -1; return -1;
} }
@ -2469,7 +2474,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
goto error_return; goto error_return;
} }
} }
if (old_sha1 && verify_lock(lock, old_sha1, mustexist)) { if (old_sha1 && verify_lock(lock, old_sha1, mustexist, err)) {
last_errno = errno; last_errno = errno;
goto error_return; goto error_return;
} }