On Wed, Oct 5, 2011 at 6:32 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Does it also refrain from creating sequencer state directory? I'm not familiar with the sequencer code. It's not in master is it? What's happening here is that do_pick_commit() was creating CHERRY_PICK_HEAD, but then git aborts several call sites away (do_recursive_merge -> merge_trees -> git_merge_trees -> unpack_trees -> display_error_msgs). So I think do_pick_commit() needs to defer creating CHERRY_PICK_HEAD till after the possible abort. I don't know if that's the right fix for next or not, but it seems correct for master. j. -- 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