Ramkumar Ramachandra wrote: > Jonathan Nieder wrote: >> Ramkumar Ramachandra wrote: >>> - test_must_fail git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick && >>> + test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick && >>> test_path_is_dir .git/sequencer && >> >> Encountered conflicts, preserving options, but the exit is with status >> 128? Smells like a bug. > > No bug. Ok. I'm fuzzy on the details, but is it possible to make this change in such a way as to make that obvious? For example, perhaps this should be split into several tests: one to check that such mistaken use of "-m 1" with non-merge commits correctly interrupts the cherry-pick and pleads to the user for advice (should it?), another to check that doing so produces an exit status of 128 (if it should), and another to make sure that doing so, fixing things up somehow, and resuming the sequence allows the effect of "-m 1" to carry over to later commits. -- 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