[PATCH 18/18] reflog_expire(): integrate lock_ref_sha1_basic() errors into ours

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: May 1, 2015, 12:25 UTC
Message-ID: <1430483158-14349-19-git-send-email-mhagger@alum.mit.edu>
In-Reply-To: <1430483158-14349-1-git-send-email-mhagger@alum.mit.edu>

Now that lock_ref_sha1_basic() gives us back its error messages via a strbuf, incorporate its error message into our error message rather than emitting two separate error messages.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/refs.c b/refs.c
index f64f6ae..0bff903 100644
--- a/refs.c
+++ b/refs.c
@@ -4129,9 +4129,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
 	 */
 	lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err);
 	if (!lock) {
-		error("%s", err.buf);
+		error("cannot lock ref '%s': %s", refname, err.buf);
 		strbuf_release(&err);
-		return error("cannot lock ref '%s'", refname);
+		return -1;
 	}
 	if (!reflog_exists(refname)) {
 		unlock_ref(lock);

-- 
2.1.4