diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 09:17:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 09:17:32 -0800 |
| commit | af09003b2897db76cefdb08ab363ed68f2bb295b (patch) | |
| tree | 8f617103d7c7aee4fe31417fb88365e22e00edad | |
| parent | 58fcd54853023b28a44016c06bd84fc91d2556ed (diff) | |
| parent | b22d7484034670d08f438c9f1376423adce1e29c (diff) | |
| download | git-af09003b2897db76cefdb08ab363ed68f2bb295b.tar.gz git-af09003b2897db76cefdb08ab363ed68f2bb295b.tar.xz | |
Merge branch 'jc/lock-report-on-error'
* jc/lock-report-on-error:
lockfile: move REPORT_ON_ERROR bit elsewhere
| -rw-r--r-- | lockfile.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |