Hi Junio, Thanks for the thorough review. On Sat, Mar 5, 2016 at 10:34 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Is it worth checking the case where autostash kicks in, rebase > itself is completed successfully, but the final "stash pop" fails in > conflict? I am thinking aloud and just wondering, not suggesting > to add such a test, or even suggesting that having such a test is > worthwhile. I didn't even check if there is already an existing test > to cover that case. I think this case has already been checked in t3420-rebase.autostash.sh: "rebase$type: non-conflicting rebase, conflicting stash". Though in that test rebase.autoStash has been used to trigger git-stash. Thanks, Mehul -- 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