On Tue, Jun 27, 2017 at 8:46 PM, Stefan Beller <sbel...@google.com> wrote:
> On Tue, Jun 27, 2017 at 5:17 AM, Ævar Arnfjörð Bjarmason
> <ava...@gmail.com> wrote:
>> 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.
>>
>
>> +++ 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?
Just so we can cook this in pu (including for those cloning with
--recursive) until upstream merges my patches.
We're now in a chicken & egg scenario where the patch I have (minus
nits mentioned on list, will fix) should work, but needs testing, and
once it has testing upstream is willing to merge it, and getting it
into pu (with my clone/branch) will give it more testing).
