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

Comparing rebase --am with --interactive via p3400

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 1, 2019, 06:04 UTC
Message-ID
<nycvar.QRO.7.76.6.1901312310280.41@tvgsbejvaqbjf.bet>
Hi Elijah,

as discussed at the Contributors' Summit, I ran p3400 as-is (i.e. with the --am backend) and then with --keep-empty to force the interactive backend to be used. Here are the best of 10, on my relatively powerful Windows 10 laptop, with current `master`.

With regular rebase --am:

3400.2: rebase on top of a lot of unrelated changes 5.32(0.06+0.15) 3400.4: rebase a lot of unrelated changes without split-index 33.08(0.04+0.18) 3400.6: rebase a lot of unrelated changes with split-index 30.29(0.03+0.18)

with --keep-empty to force the interactive backend:

3400.2: rebase on top of a lot of unrelated changes 3.92(0.03+0.18) 3400.4: rebase a lot of unrelated changes without split-index 33.92(0.03+0.22) 3400.6: rebase a lot of unrelated changes with split-index 38.82(0.03+0.16)

I then changed it to -m to test the current scripted version, trying to let it run overnight, but my laptop eventually went to sleep and the tests were not even done. I'll let them continue and report back.

My conclusion after seeing these numbers is: the interactive rebase is really close to the performance of the --am backend. So to me, it makes a total lot of sense to switch --merge over to it, and to make --merge the default. We still should investigate why the split-index performance is so significantly worse, though.

Ciao, Dscho

Next: Johannes Schindelin
Message 1 of 11 in “Comparing rebase --am with --interactive via p3400”
  1. Johannes SchindelinFeb 1, 2019
  2. Johannes SchindelinFeb 1, 2019
  3. Elijah NewrenFeb 1, 2019
  4. Alban GruinDec 27, 2019
  5. Elijah NewrenDec 27, 2019
  6. Alban GruinDec 29, 2019
  7. Johannes SchindelinJan 2, 2020
  8. Johannes SchindelinJan 31, 2020
  9. Alban GruinApr 1, 2020
  10. Phillip WoodApr 1, 2020
  11. Johannes SchindelinApr 4, 2020

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.