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>
Martin Ågren committed
Sep 9, 2017 at 08:57 UTC
3f5ef95b5e0cc0cbff06f747ba056e132a71033a
1 file changed
+1
-1
refs/files-backend.c
+1
-1
@@ -2801,7 +2801,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
2801
strbuf_addf(err, "cannot lock ref '%s': "
2802
"error reading reference",
2803
original_update_refname(update));
2804
- ret = -1;
2804
+ ret = TRANSACTION_GENERIC_ERROR;
2805
goto out;
2806
}
2807
} else if (check_old_oid(update, &lock->old_oid, err)) {