{"thread":{"id":"12161","subject":"Odd logic in rebase--interactive","startedAt":"2008-02-17T21:24:13Z","lastAt":"2008-02-17T21:41:41Z","messageCount":2,"participants":["Daniel Barkalow","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"69041","messageId":"alpine.LNX.1.00.0802171620060.5816@iabervon.org","threadId":"12161","inReplyTo":null,"subject":"Odd logic in rebase--interactive","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-02-17T21:24:13Z","receivedAt":"2008-02-17T21:24:13Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"In 1d25c8cf, you made pick_one not use the code for current and parent \nbeing the same if no_ff is set, which is true if -n is given. This looks \nlike it makes the \"git reset --soft $current_sha1\" line dead code. Did you \njust forget to remove it, is there some other situation in which it would \nbe wanted, or am I misunderstanding the code somehow?\n\n\t-Daniel\n*This .sig left intentionally blank*\n"},{"id":"69042","messageId":"alpine.LSU.1.00.0802172139370.30505@racer.site","threadId":"12161","inReplyTo":"alpine.LNX.1.00.0802171620060.5816@iabervon.org","subject":"Re: Odd logic in rebase--interactive","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-02-17T21:41:41Z","receivedAt":"2008-02-17T21:41:41Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 17 Feb 2008, Daniel Barkalow wrote:\n\n> In 1d25c8cf, you made pick_one not use the code for current and parent \n> being the same if no_ff is set, which is true if -n is given. This looks \n> like it makes the \"git reset --soft $current_sha1\" line dead code. Did \n> you just forget to remove it, is there some other situation in which it \n> would be wanted, or am I misunderstanding the code somehow?\n\nNo, you're correct, I just forgot to remove it.\n\nThe reset tried to have a fast track for the fast-forwarding case in the \ncase of squash.  But that was not enough, and 1d25c8cf really fixed the \nissue, making the reset code path unreachable.\n\nThanks,\nDscho\n"}]}