Re: [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, 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>
Subject: Re: [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule
Date: Mon, 03 Jul 2017 10:11:12 -0700	[thread overview]
Message-ID: <xmqqa84lmonj.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170701220547.10464-3-avarab@gmail.com> (=?utf-8?B?IsOGdmFy?= =?utf-8?B?IEFybmZqw7Zyw7A=?= Bjarmason"'s message of "Sat, 1 Jul 2017 22:05:46 +0000")

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> Add an option to use the sha1collisiondetection library from the
> submodule in sha1collisiondetection/ instead of in the copy in the
> sha1dc/ directory.
>
> This allows us to try out the submodule in sha1collisiondetection
> without breaking the build for anyone who's not expecting them as we
> work out any kinks.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  .gitmodules            |  4 ++++
>  Makefile               | 12 ++++++++++++
>  hash.h                 |  4 ++++
>  sha1collisiondetection |  1 +
>  4 files changed, 21 insertions(+)
>  create mode 100644 .gitmodules
>  create mode 160000 sha1collisiondetection
>
> diff --git a/.gitmodules b/.gitmodules
> new file mode 100644
> index 0000000000..cbeebdab7a
> --- /dev/null
> +++ b/.gitmodules
> @@ -0,0 +1,4 @@
> +[submodule "sha1collisiondetection"]
> +	path = sha1collisiondetection
> +	url = https://github.com/cr-marcstevens/sha1collisiondetection.git
> +	branch = master

Do we need to say this "branch" bit?

Other than that looks good to me.

Thanks.