From: Martin Ågren <martin.agren@gmail.com>
Date: Sat, 9 Sep 2017 06:57:17 +0000 (+0200)
Subject: refs/files-backend: correct return value in lock_ref_for_update
X-Git-Tag: v2.15.0-rc0~93^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3f5ef95b5e0cc0cbff06f747ba056e132a71033a?hp=--cc

refs/files-backend: correct return value in lock_ref_for_update

In one code path we return a literal -1 and not a symbolic constant. The
value -1 would be interpreted as TRANSACTION_NAME_CONFLICT, which is
wrong. Use TRANSACTION_GENERIC_ERROR instead (that is the only other
return value we have to choose from).

Noticed-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

3f5ef95b5e0cc0cbff06f747ba056e132a71033a
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 3d63639665..03df002759 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2801,7 +2801,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 					strbuf_addf(err, "cannot lock ref '%s': "
 						    "error reading reference",
 						    original_update_refname(update));
-					ret = -1;
+					ret = TRANSACTION_GENERIC_ERROR;
 					goto out;
 				}
 			} else if (check_old_oid(update, &lock->old_oid, err)) {