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

From: Stefan Beller <sbeller@google.com>
Date: Jun 27, 2017, 18:46 UTC
Message-ID: <CAGZ79kYzZqAm9AgiXAanBTzJfHStebCy9Z6MvhniRjS3s1wG-Q@mail.gmail.com>
In-Reply-To: <20170627121718.12078-3-avarab@gmail.com>

On Tue, Jun 27, 2017 at 5:17 AM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 11 quoted lines

> 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.
>
> This uses my own fork which integrates PR #36. See the preceding
> commit ("sha1dc: update from my PR #36", 2017-06-27) for details.
>

Show 6 quoted lines

> +++ b/.gitmodules
> @@ -0,0 +1,4 @@
> +[submodule "sha1collisiondetection"]
> +       path = sha1collisiondetection
> +       url = https://github.com/avar/sha1collisiondetection.git
> +       branch = bigend-detect-solaris-again

What is the motivation for the branch field here? While this series fixes a hot issue, in the long run we'd rather want to plug in the original upstream with the master branch?