Andrew Wong wrote: > But what I meant was, regardless of who's calling "cherry-pick", if > "cherry-pick" runs into an error and needs to stop, it needs to save a > state so that it can do a "--continue". And this behavior should stay > the same regardless of who the caller is. And that means its callers > (e.g. "rebase -i") should know about this and do a cleanup when > "cherry-pick" failed. The current CHERRY_PICK_HELP codepath removes CHERRY_PICK_HEAD to let its caller take care of the appropriate "commit -c" magic for historical reasons. I'd be happy to see "rebase -i" stop relying on that. Unfortunately, outside scripts from before CHERRY_PICK_HEAD existed are also allowed to use CHERRY_PICK_HELP, so the incomplete implementation that leaves behind a CHERRY_PICK_HEAD when the commit being cherry-picked resolves into nothingness is still a bug. -- 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