On Mon, Jul 03 2017, Junio C. Hamano jotted:
> Ævar Arnfjörð Bjarmason <ava...@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 <ava...@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?
Yes, it's to make future updates easier, see b928922727 ("submodule add:
If --branch is given, record it in .gitmodules", 2012-12-19).
> Other than that looks good to me.
>
> Thanks.
