On Sat, May 20, 2017 at 1:13 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > >> Replace the forked sha1dc directory with a copy of the upstream code >> imported as a submodule. This is the exact same code as now exists in >> the sha1dc/ directory. >> >> The initial reason for copy/pasting the code into sha1dc and locally >> modifying it was that it needed to be altered to work with the git >> project. >> >> The upstream project has accepted my code changes to allow us to use >> their code as-is, see the preceding commit for details. So import the >> code as a submodule instead, this will make it easier to keep >> up-to-date with any upstream fixes or improvements. >> >> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> >> --- >> .gitmodules | 4 ++++ >> Makefile | 4 ++-- >> hash.h | 2 +- >> sha1collisiondetection | 1 + >> 4 files changed, 8 insertions(+), 3 deletions(-) >> create mode 100644 .gitmodules >> create mode 160000 sha1collisiondetection > > I am not sure how prepared our .travis.yml is to deal with a > submodule, I'd prefer to have this step broken down to two step > process. I've since sent a v2 of this which addresses this by being more careful, but since then I found these Travis docs that seem to indicate that cloning the submodule will Just Work: https://docs.travis-ci.com/user/common-build-problems/#Git-Submodules-are-not-updated-correctly