From b22d7484034670d08f438c9f1376423adce1e29c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 27 Dec 2016 09:12:09 -0800 Subject: 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 --- lockfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lockfile.h') diff --git a/lockfile.h b/lockfile.h index 16775a7d7..7b715f9e7 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 -- cgit v1.2.1