On Thu, Oct 6, 2011 at 1:02 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > I think do_recursive_merge() would die() when the merge cannot even start > (i.e. the local changes after the cherry-pick exits are the ones from the > time before such a failed cherry-pick started), but I suspect that the > other codepath uses try_merge_command() to drive strategies other than > recursive and it does not die() there in such a case. Can you make sure > this patch is sufficient in such a case as well? It's wrong to write out CHERRY_PICK_HEAD if we couldn't start the merge, but using cherry-pick with a strategy other than recursive seems broken in that case in other ways as well: $ git cherry-pick --strategy=resolve side error: Untracked working tree file 'bar' would be overwritten by merge. error: could not apply a77535c9ac... bar hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' The "hint" advice is completely wrong. 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