Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: >> Remember --allow-empty, --allow-empty-message and >> --keep-redundant-commits when cherry-pick stops for a conflict >> resolution. >> >> Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > This whole patch series makes sense to me. Yes, the changes look sensible (provided if it is the sensible goal to make --continue use the same set of options, that is). > And it is especially nice that you make it easy to verify that there is a > bug in the first place, by separating the concern of demonstrating it from > the concern to fix it. For a multi-patch series, breaking out the verification test out of the fixing patch is OK. It is a different story for a simple change that could be made in a single step to artificially separate the test into a separate step. An early "test_expect_failure" would not stop the test when applied to a different codebase as a standalone "does the breakage exist in this unrelated version?" even if the "test only" patch might appear easier to apply (as opposed to applying only the t/ part of the patch that expects success and seeing it actually fail).
