undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lockfile: move REPORT_ON_ERROR bit elsewhere

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2016-12-27 09:12:09 -08:00
parent 3f061bf514
commit b22d748403
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lockfile.h
View 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