mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs/files-backend: correct return value in lock_ref_for_update

Browse Source 
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>
This commit is contained in:
Martin Ågren
2017-09-09 08:57:17 +02:00
committed by Junio C Hamano
parent 851e1fbd01
commit 3f5ef95b5e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
refs/files-backend.c
View File

@ -2801,7 +2801,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
strbuf_addf(err, "cannot lock ref '%s': " strbuf_addf(err, "cannot lock ref '%s': "
"error reading reference", "error reading reference",
original_update_refname(update)); original_update_refname(update));
ret = -1; ret = TRANSACTION_GENERIC_ERROR;
goto out; goto out;
} }
} else if (check_old_oid(update, &lock->old_oid, err)) { } else if (check_old_oid(update, &lock->old_oid, err)) {