> On 17 Mar 2017, at 11:18, Lars Schneider <larsxschneider@xxxxxxxxx> wrote: > > >> On 17 Mar 2017, at 03:22, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: >> >> I think there's a semantic merge error and it clashes with >> f18f816cb158 ("hash.h: move SHA-1 implementation selection into a >> header file"). >> >> Suggested possible merge resolution attached. >> >> Linus >> <patch.diff> > > Would it make sense/have value to add a job to our TravisCI build [1] > that compiles Git in a few variations with some high profile switches > such as USE_SHA1DC? Running all the tests for these variations would > probably take to long but just compiling would be less than 2min per > variation. ... or just run individual tests instead of the entire test suite for these variations (e.g. only t0013 for the USE_SHA1DC variation). - Lars