# Odd logic in rebase--interactive 2 messages from 2008-02-17 to 2008-02-17. Participants: Daniel Barkalow, Johannes Schindelin. Thread: https://gitlist.dev/t/12161 ## Daniel Barkalow, 2008-02-17 21:24 Subject: Odd logic in rebase--interactive Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0802171620060.5816%40iabervon.org ``` 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? -Daniel *This .sig left intentionally blank* ``` ## Johannes Schindelin, 2008-02-17 21:41 Subject: Re: Odd logic in rebase--interactive Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0802172139370.30505%40racer.site In-Reply-To: ``` 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 ```