Phillip Wood <phillip.wood123@xxxxxxxxx> writes: >>> I don't this patch can distinguish between an empty cherry-pick >>> performed by the user while a rebase is in progress and an empty pick >>> performed by rebase as both create CHERRY_PICK_HEAD while >>> .git/rebase-merge exists. It seems to assume that CHERRY_PICK_HEAD was >>> created by rebase and prints advise based on that which may or may not >>> be the correct. I think we could distinguish the two by checking if >>> CHERRY_PICK_HEAD matches .git/rebase-merge/stopped-sha or REBASE_HEAD. >> >> I guess we could, but then, I would rather worry about that in the next >> cycle. In this cycle, I would rather fix the common case, which is that >> a `git rebase -i` fails and tells me to `git cherry-pick --skip` instead >> of `git rebase --skip`. >> >> And even if I performed a `git cherry-pick` during a `git rebase` and >> the result would be an empty commit, I'd rather be told to `git rebase >> --skip` to continue... >> >> But if you feel strongly that this should be fixed differently, I'll >> gladly leave it to you ;-) > > I'm happy to wait until the next cycle once we've decided what to do > about CHERRY_PICK_HEAD during rebases. So, is that agreed between the two? Should I eject js/advise-rebase-skip topic out of my tree and wait for the decision wrt CHERRY_PICK_HEAD? Thanks.
