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

[BUG?] git rebase -i

From
PBPieter de Bie <frim@frim.nl>
Date
Dec 14, 2007, 01:21 UTC
Message-ID
<2791F15A-EB72-4FE4-8DB3-7A4B4DCB07B3@frim.nl>
Hi,
I was just toying with git rebase -i -p, when I found the following:

Tirana:~/git pieter$ /opt/local/bin/git --version git version 1.5.3.5

Tirana:~/git pieter$ time /opt/local/bin/git rebase -p -i HEAD~100 Successfully rebased and updated refs/heads/master.

real 0m17.816s user 0m3.927s sys 0m10.381s

Tirana:~/git pieter$ git --version git version 1.5.4.rc0 Tirana:~/git pieter$ time git rebase -p -i HEAD~100 cat: /Users/pieter/git/.git/.dotest-merge/rewritten/ 1e8df762b38e01685f3aa3613e2d61f73346fcbe: No such file or directory

real 0m20.427s user 0m4.449s sys 0m14.028s

The rebase in 1.5.4.rc0 exists with an error. Another thing to note is that the 1.5.4.rc0 tries to apply 215 patches, while the 1.5.3.5 tries to apply 206 patches. This test was done on the git master branch (tagged 1.5.4.rc0). I did not change anything in the interactive rebase editor (just hit :wq in vim).

- Pieter
Next: Johannes Sixt
Message 1 of 7 in “[BUG?] git rebase -i”
  1. Pieter de BieDec 14, 2007
  2. Johannes SixtDec 14, 2007
  3. Pieter de BieDec 17, 2007
  4. rebase -p -i: handle "no changes" gracefullyJohannes Schindelin, Dec 17, 2007
  5. Junio C HamanoDec 17, 2007
  6. rebase -p -i: handle "no changes" gracefullyJohannes Schindelin, Dec 17, 2007
  7. Junio C HamanoDec 18, 2007

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.