Hi, On Sun, 17 Feb 2008, Daniel Barkalow wrote: > In 1d25c8cf, you made pick_one not use the code for current and parent > being the same if no_ff is set, which is true if -n is given. This looks > like it makes the "git reset --soft $current_sha1" line dead code. Did > you just forget to remove it, is there some other situation in which it > would be wanted, or am I misunderstanding the code somehow? No, you're correct, I just forgot to remove it. The reset tried to have a fast track for the fast-forwarding case in the case of squash. But that was not enough, and 1d25c8cf really fixed the issue, making the reset code path unreachable. Thanks, Dscho - 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
