From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Dec 2016, #05; Mon, 19)
Date: Tue, 27 Dec 2016 09:16:56 -0800 [thread overview]
Message-ID: <xmqqd1gdcmwn.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <afd95065-d076-b962-8337-b87008b9f894@alum.mit.edu> (Michael Haggerty's message of "Tue, 27 Dec 2016 18:04:30 +0100")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> Sorry I didn't notice this earlier, but the `LOCK_REPORT_ON_ERROR`
> constant introduced by
>
> 3f061bf "lockfile: LOCK_REPORT_ON_ERROR", 2016-12-07
>
> sets that constant to the value 2,...
Sorry I didn't notice this earlier, either. Thanks for spotting.
-- >8 --
From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 09:12:09 -0800
Subject: [PATCH] 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>
---
lockfile.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.11.0-449-gc01fa73926
next prev parent reply other threads:[~2016-12-27 17:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-20 0:21 What's cooking in git.git (Dec 2016, #05; Mon, 19) Junio C Hamano
2016-12-27 17:04 ` Michael Haggerty
2016-12-27 17:16 ` Junio C Hamano [this message]
2016-12-27 18:22 ` Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd1gdcmwn.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox