Commit b22d7484 authored by Junio C Hamano's avatar Junio C Hamano

lockfile: move REPORT_ON_ERROR bit elsewhere

There was LOCK_NO_DEREF defined as 2 = 1<<1 with the same value,
which was missed due to a huge comment block.  Deconflict by moving
the new one to 4 = 1<<2 for now.
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 3f061bf5
...@@ -137,7 +137,7 @@ struct lock_file { ...@@ -137,7 +137,7 @@ struct lock_file {
* ... this flag can be passed instead to return -1 and give the usual * ... this flag can be passed instead to return -1 and give the usual
* error message upon an error. * error message upon an error.
*/ */
#define LOCK_REPORT_ON_ERROR 2 #define LOCK_REPORT_ON_ERROR 4
/* /*
* Usually symbolic links in the destination path are resolved. This * Usually symbolic links in the destination path are resolved. This
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment