On Thu, Oct 06, 2011 at 02:37:02PM +0200, Nicolas Dichtel wrote: > >>Maybe it is related to the problem I've reported in another thread: > >>http://comments.gmane.org/gmane.comp.version-control.git/182853 > > > >Possibly. That issue is about the commit that comes _after_ the > >cherry-pick, and in this instance, things are already wrong for you by > >the time the cherry-pick has completed. > > > >However, the problem has to do with leaving a stale state file in .git, > >so perhaps a previous partially-completed cherry-pick has left cruft in > >.git that is confusing this cherry-pick (i.e., I can't reproduce because > >it is being affected by something that happened before the commands > >above). So let's see what Jay comes up with for solving the other > >problem, and I suspect it may just fix this issue, too. > I think so too. Will wait. Since you can reproduce this so readily, and since you said it seems to work with older versions of git, you might try bisecting. There's a reasonable chance it will just end up at Jay's CHERRY_PICK_HEAD commit, but it might be worth doing. -Peff -- 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