On Fri, Apr 13, 2018 at 12:56 PM, Elijah Newren <new...@gmail.com> wrote: > Add several tests checking whether updates can be skipped in a merge. > Also add several similar testcases for where updates cannot be skipped in > a merge to make sure that we skip if and only if we should. > > In particular: > > * Testcase 1a (particularly 1a-check-L) would have pointed out the > problem Linus has been dealing with for year with his merges[1]. > > * Testcase 2a (particularly 2a-check-L) would have pointed out the > problem with my directory-rename-series before it broke master[2]. > > * Testcases 3[ab] (particularly 3a-check-L) provide a simpler testcase > than 12b of t6043 making that one easier to understand. > > * There are several complementary testcases to make sure we're not just > fixing those particular issues while regressing in the opposite > direction. > > [1] > https://public-inbox.org/git/CA+55aFzLZ3UkG5svqZwSnhNk75=fxjrkvu1m_rhbg54nooa...@mail.gmail.com/ > [2] https://public-inbox.org/git/xmqqmuya43cs....@gitster-ct.c.googlers.com/ > > Signed-off-by: Elijah Newren <new...@gmail.com>
This is Reviewed-by: Stefan Beller <sbel...@google.com> > + test_tick && > + git commit -m "O" && minor nit: I think you can omit the test_tick before creating O for each setup. Stefan
