From: Michael Haggerty Date: Mon, 11 May 2015 15:25:18 GMT Subject: [PATCH v2 16/18] ref_transaction_commit(): provide better error messages Message-ID: <1431357920-25090-17-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1431357920-25090-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 one error messages to stderr immediately and returning a second to our caller. Signed-off-by: Michael Haggerty --- refs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 87c1ad1..ecaf804 100644 --- a/refs.c +++ b/refs.c @@ -3838,13 +3838,15 @@ int ref_transaction_commit(struct ref_transaction *transaction, &update->type, err); if (!update->lock) { + char *reason; + ret = (errno == ENOTDIR) ? TRANSACTION_NAME_CONFLICT : TRANSACTION_GENERIC_ERROR; - error("%s", err->buf); - strbuf_reset(err); - strbuf_addf(err, "Cannot lock the ref '%s'.", - update->refname); + reason = strbuf_detach(err, NULL); + strbuf_addf(err, "Cannot lock the ref '%s': %s", + update->refname, reason); + free(reason); goto cleanup; } } -- 2.1.4