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: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 27, 2016 at 09:12 UTC
b22d7484034670d08f438c9f1376423adce1e29c
1 file changed
+1
-1
lockfile.h
+1
-1
@@ -137,7 +137,7 @@ struct lock_file {
137
* ... this flag can be passed instead to return -1 and give the usual
138
* error message upon an error.
139
*/
140
-#define LOCK_REPORT_ON_ERROR 2
140
+#define LOCK_REPORT_ON_ERROR 4
141
142
/*
143
* Usually symbolic links in the destination path are resolved. This