On 04/12/17 19:24, Stefan Beller wrote: > On Fri, Nov 24, 2017 at 3:07 AM, Phillip Wood <phillip.wood@xxxxxxxxxxxx> wrote: >> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> >> Now that the sequencer creates commits without forking 'git commit' it >> does not see an empty commit in these tests which fixes the known >> breakage. Note that logic for handling >> KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 is not removed from >> lib-submodule-update.sh as it is still used by other tests. >> >> Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> --- >> >> Notes: >> The output of the tests with after the previous patch looks like the >> output of the merge tests (see below), so I'm hopeful that this is a >> genuine fix, but someone who knows about submodules should check that >> things are in fact working properly now. > > Looking at the patch only (in combination with the history of the > submodule tests, > 283f56a40b (cherry-pick: add t3512 for submodule updates, 2014-06-15)) > this patch > looks good to me. I wonder though if this needs to be squashed in another commit > to keep the test suite working for each patch and have no intermittent > failure in the > series. Hi Stefan Thanks for looking at this, it's good to know you think it's OK. I'll leave it to Junio's discretion whether to squash this into the previous patch Thanks again Phillip > Thanks, > Stefan >
