Hi, Jonathan Nieder wrote: > [...] > Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> > Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> > > and Junio can add his sign-off below that when applying some version > to his tree. Bonus points if you mention what tweaks you made when > you are not just passing it on. True, the signoff-chain does look like quite a mess now :P [rr: minor improvements, tests] should be fine. >> --- a/t/t3510-cherry-pick-sequence.sh >> +++ b/t/t3510-cherry-pick-sequence.sh >> @@ -414,4 +414,15 @@ test_expect_success 'mixed pick and revert instructions' ' >> +test_expect_success 'commit set passed through --all' ' >> + pristine_detach initial && >> + test_expect_code 1 git cherry-pick --all && >> + git cherry-pick --continue >> +' > > What does this test mean? "git cherry-pick --all" should report a > spurious conflict, and then --continue will clean it up automagically > and all will be well? This one's actually quite interesting. "git cherry-pick --all" first tries to apply everything from "intial" to "yetanotherpatch" (both inclusive) -- its first "git commit" invocation returns 1, refusing to create an empty commit. Then when we say "--continue", it notices that the worktree and index are clean, removes "initial" from the instruction sheet and executes everything else as usual. This is something we should attempt to fix in the future: I think the Right Way starts with creating an API for "git commit". Thanks. -- 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