Jonathan Nieder wrote: > Ramkumar Ramachandra wrote: > > [...] >> --- a/t/t3510-cherry-pick-sequence.sh >> +++ b/t/t3510-cherry-pick-sequence.sh > [...] >> @@ -53,7 +53,7 @@ test_expect_success 'cherry-pick persists data on failure' ' >> >> test_expect_success 'cherry-pick persists opts correctly' ' >> pristine_detach initial && >> - 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. Notice that "-m 1" is used when "initial" isn't a merge commit. But yeah, I should probably clarify this by changing the revision range to "initial..anotherpick" so as not to distract the user. -- Ram -- 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