| commit | b22d7484034670d08f438c9f1376423adce1e29c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Dec 2016 17:12:09 +0000 (27 09:12 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Dec 2016 17:12:09 +0000 (27 09:12 -0800) | ||
| tree | 8832c61cff0797ea19ed1c0b1d93d6f1bbfa5c01 | treesnapshot (tar.gz zip) |
| parent | 3f061bf514667497a948804828064b9b9c3b249b | commitdiff |
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>
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>
| lockfile.h | diffblobblamehistory |