From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 17:17:32 +0000 (-0800)
Subject: Merge branch 'jc/lock-report-on-error'
X-Git-Tag: v2.12.0-rc0~94
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af09003b2897db76cefdb08ab363ed68f2bb295b?hp=58fcd54853023b28a44016c06bd84fc91d2556ed

Merge branch 'jc/lock-report-on-error'

* jc/lock-report-on-error:
lockfile: move REPORT_ON_ERROR bit elsewhere
---

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