git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Odd logic in rebase--interactive

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 17, 2008, 21:41 UTC
Message-ID
<alpine.LSU.1.00.0802172139370.30505@racer.site>
In-Reply-To
<alpine.LNX.1.00.0802171620060.5816@iabervon.org>
Hi,
On Sun, 17 Feb 2008, Daniel Barkalow wrote:
Show 5 quoted lines
> 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

Previous: Daniel Barkalow
Message 2 of 2 in “Odd logic in rebase--interactive”
  1. Daniel BarkalowFeb 17, 2008
  2. Johannes SchindelinFeb 17, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.