From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Michael Kebe" <michael.kebe@gmail.com>,
"Liam R . Howlett" <Liam.Howlett@Oracle.com>,
"Adam Dinwoodie" <adam@dinwoodie.org>,
"Stefan Beller" <sbeller@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 3/3] sha1collisiondetection: automatically enable when submodule is populated
Date: Tue, 27 Jun 2017 20:33:48 +0000 [thread overview]
Message-ID: <20170627203348.19827-4-avarab@gmail.com> (raw)
In-Reply-To: <20170627203348.19827-1-avarab@gmail.com>
In-Reply-To: <20170627121718.12078-1-avarab@gmail.com>
From: Junio C Hamano <gitster@pobox.com>
If a user wants to experiment with the version of collision
detecting sha1 from the submodule, the user needed to not just
populate the submodule but also needed to turn the knob.
A Makefile trick is easy enough to do so, so let's do this. When
somebody with a copy of the submodule populated wants not to use it,
that can be done by overriding it in config.mak or from the command
line.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index f0cac1f246..3baa1eac0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1009,6 +1009,10 @@ EXTLIBS =
GIT_USER_AGENT = git/$(GIT_VERSION)
+ifeq ($(wildcard sha1collisiondetection/lib/sha1.h),sha1collisiondetection/lib/sha1.h)
+DC_SHA1_SUBMODULE = auto
+endif
+
include config.mak.uname
-include config.mak.autogen
-include config.mak
--
2.13.1.611.g7e3b11ae1
next prev parent reply other threads:[~2017-06-27 20:34 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 7:32 Compile Error v2.13.2 on Solaris SPARC Michael Kebe
[not found] ` <87lgofcf7r.fsf@gmail.com>
2017-06-26 12:36 ` Michael Kebe
2017-06-26 12:47 ` Ævar Arnfjörð Bjarmason
2017-06-26 14:00 ` Michael Kebe
2017-06-26 18:31 ` Ævar Arnfjörð Bjarmason
2017-06-26 18:29 ` Liam R. Howlett
[not found] ` <87fuem7aw2.fsf@gmail.com>
2017-06-27 5:41 ` Michael Kebe
2017-06-27 6:28 ` Michael Kebe
2017-06-27 16:28 ` Liam R. Howlett
2017-06-27 17:38 ` Junio C Hamano
2017-06-27 18:29 ` Liam R. Howlett
2017-06-27 18:55 ` Ævar Arnfjörð Bjarmason
2017-06-27 17:59 ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 0/3] update sha1dc from PR #36 Ævar Arnfjörð Bjarmason
2017-06-27 18:37 ` Stefan Beller
2017-06-27 20:33 ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2017-06-27 21:37 ` Junio C Hamano
2017-06-27 21:38 ` Junio C Hamano
2017-06-27 22:24 ` Ævar Arnfjörð Bjarmason
2017-06-28 21:42 ` Ævar Arnfjörð Bjarmason
2017-06-28 22:02 ` Junio C Hamano
2017-06-27 20:33 ` [PATCH v2 1/3] sha1dc: correct endian detection for Solaris (and others?) Ævar Arnfjörð Bjarmason
2017-06-27 20:33 ` [PATCH v2 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-27 20:33 ` Ævar Arnfjörð Bjarmason [this message]
2017-07-01 22:05 ` [PATCH v3 0/3] Update sha1dc from upstream Ævar Arnfjörð Bjarmason
2017-07-01 22:05 ` [PATCH v3 1/3] sha1dc: update " Ævar Arnfjörð Bjarmason
2017-07-01 22:05 ` [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-07-03 17:11 ` Junio C Hamano
2017-07-03 20:29 ` Ævar Arnfjörð Bjarmason
2017-07-04 17:26 ` Junio C Hamano
2017-07-04 22:50 ` Ævar Arnfjörð Bjarmason
2017-07-05 0:36 ` Stefan Beller
2017-07-05 1:56 ` Junio C Hamano
2017-07-05 17:46 ` Stefan Beller
2017-07-05 18:03 ` Ævar Arnfjörð Bjarmason
2017-07-01 22:05 ` [PATCH v3 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 1/3] sha1dc: update from my PR #36 Ævar Arnfjörð Bjarmason
2017-06-27 15:22 ` Junio C Hamano
2017-06-27 15:53 ` Junio C Hamano
2017-06-27 18:07 ` Ævar Arnfjörð Bjarmason
2017-06-27 15:55 ` Junio C Hamano
2017-06-27 16:31 ` Liam R. Howlett
2017-06-27 18:11 ` Ævar Arnfjörð Bjarmason
2017-06-27 19:10 ` Junio C Hamano
2017-06-27 19:33 ` Junio C Hamano
2017-06-27 19:35 ` Ævar Arnfjörð Bjarmason
2017-06-27 19:38 ` Junio C Hamano
2017-06-27 19:38 ` Liam R. Howlett
2017-06-27 19:48 ` Junio C Hamano
2017-06-27 18:06 ` Ævar Arnfjörð Bjarmason
2017-06-27 18:12 ` Junio C Hamano
2017-06-27 18:19 ` Ævar Arnfjörð Bjarmason
2017-06-27 20:17 ` Junio C Hamano
2017-06-27 18:23 ` Junio C Hamano
2017-06-27 18:52 ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-27 18:46 ` Stefan Beller
2017-06-27 18:56 ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170627203348.19827-4-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=Liam.Howlett@Oracle.com \
--cc=adam@dinwoodie.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michael.kebe@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).