diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2017-09-09 08:57:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 16:36:58 +0900 |
| commit | 3f5ef95b5e0cc0cbff06f747ba056e132a71033a (patch) | |
| tree | 5ef5e9112b74b792cc439caf88b66a51287fda14 | |
| parent | 851e1fbd01250f56a6e479e1addada220a56e1f7 (diff) | |
| download | git-3f5ef95b5e0cc0cbff06f747ba056e132a71033a.tar.gz git-3f5ef95b5e0cc0cbff06f747ba056e132a71033a.tar.xz | |
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>
| -rw-r--r-- | refs/files-backend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index 3d6363966..03df00275 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)) { |