Instead of writing error messages directly to stderr, write them to a
"strbuf *err". In lock_ref_sha1_basic(), arrange for these errors to
be returned to its caller.
Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
---
refs.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index 100a767..625e69f 100644
--- a/refs.c
+++ b/refs.c
@@ -2198,23 +2198,28 @@ static void unlock_ref(struct ref_lock *lock)
/*
* 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
- * on success or a negative value on error. This function should make
- * sure errno is meaningful on error.
+ * on success. On error, write an error message to err, set errno, and
+ * return a negative value.
*/
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,
mustexist ? RESOLVE_REF_READING : 0,
lock->old_sha1, NULL)) {
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;
return -1;
}
if (hashcmp(lock->old_sha1, old_sha1)) {
- error("Ref %s is at %s but expected %s", lock->ref_name,
- sha1_to_hex(lock->old_sha1), sha1_to_hex(old_sha1));
+ strbuf_addf(err, "Ref %s is at %s but expected %s",
+ lock->ref_name,
+ sha1_to_hex(lock->old_sha1),
+ sha1_to_hex(old_sha1));
errno = EBUSY;
return -1;
}
@@ -2448,7 +2453,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char
*refname,
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;
goto error_return;
}
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
