Ramkumar Ramachandra wrote: > Jonathan Nieder writes: >> Ramkumar Ramachandra wrote: >>> + if (opts->subcommand == REPLAY_RESET) { >>> + remove_sequencer_state(1); >>> + return 0; >>> + } else { >>> + /* Start a new cherry-pick/ revert sequence */ >> >> Can un-indent by dropping the "else": > > Actually this was intentional; if we un-indent this now, there'll be a > diff indenting it when '--reset' and '--continue' are introduced which > turns out to be especially ugly :) Why couldn't it look like this at the end, for example? (As always, this is just an example; I am not saying "please make it look like this".) if (opts->subcommand == REPLAY_RESET) { remove_sequencer_state(1); return 0; } if (opts->subcommand == REPLAY_CONTINUE) { ... prepare todo list for continue ... } else { ... prepare todo list for a new cherry-pick ... } pick the chosen commits >> This is not about this patch, but ideally the cleanup would come at >> the beginning of the next test, so if one test fails it does not take >> down all the tests that come after it. > > Good point. Fixed all, thanks. Thanks for looking into it. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html