Phil Hord <hordp@xxxxxxxxx> writes: > In git.git 'master' when I cherry-pick a commit which is eventually > empty, git gives me a friendly description of my supposed error, leaves > my cherry-pick "pending" and exits with an error code. > > > $ git cherry-pick a0aff2d > # On branch master > nothing to commit (working directory clean) > The previous cherry-pick is now empty, possibly due to conflict resolution. > If you wish to commit it anyway, use: > > git commit --allow-empty > > Otherwise, please use 'git reset' > > > In 'next' this is broken. Now git does not tell me anything and it does > not exit with an error code. It does still leave the cherry-pick > pending, though. > > > $ git cherry-pick a0aff2d > $ cat /tmp/repo/.git/CHERRY_PICK_HEAD > a0aff2da3d12a9a097c02e39570611f359433c23 > > It bisects to this commit: > > commit b27cfb0d8d4cbb6d079c70ffeadac9c0dcfff250 > Author: Neil Horman <nhorman@xxxxxxxxxxxxx> > Date: Fri Apr 20 10:36:15 2012 -0400 > > git-cherry-pick: Add keep-redundant-commits option > ... > I don't have time to chase it any further today. Hopefully someone can > see the flub and straighten it out before I get a chance to look again. > If not, I'll probably forget anyway. Given that I am currently very deep in today's integration round, I wouldn't have a chance to look into this. I am OK with reverting the whole topic (and I am also very much tempted to do so), as nobody other than Neil seemed to have wanted this "feature". and even though it is "optional", I doubt it encourages a good workflow. Let's see if somebody comes up with a fix quickly enough before the -rc1 is tagged. Thanks for a report. -- 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