summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-27 09:12:09 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-27 09:12:09 -0800
commitb22d7484034670d08f438c9f1376423adce1e29c (patch)
tree8832c61cff0797ea19ed1c0b1d93d6f1bbfa5c01
parentlockfile: LOCK_REPORT_ON_ERROR (diff)
downloadtgif-b22d7484034670d08f438c9f1376423adce1e29c.tar.xz
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>
-rw-r--r--lockfile.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lockfile.h b/lockfile.h
index 16775a7d79..7b715f9e77 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -137,7 +137,7 @@ struct lock_file {
* ... this flag can be passed instead to return -1 and give the usual
* 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