Skip to content

Commit b22d748

Browse files
committed
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 <[email protected]>
1 parent 3f061bf commit b22d748

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lockfile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ struct lock_file {
137137
* ... this flag can be passed instead to return -1 and give the usual
138138
* error message upon an error.
139139
*/
140-
#define LOCK_REPORT_ON_ERROR 2
140+
#define LOCK_REPORT_ON_ERROR 4
141141

142142
/*
143143
* Usually symbolic links in the destination path are resolved. This

0 commit comments

Comments
 (0)