From: Johannes Schindelin <Johannes.Schindelin@gmx.de> To: Elijah Newren <newren@gmail.com> Cc: git@vger.kernel.org Subject: Comparing rebase --am with --interactive via p3400 Date: Fri, 1 Feb 2019 07:04:31 +0100 (STD) Message-ID: <nycvar.QRO.7.76.6.1901312310280.41@tvgsbejvaqbjf.bet> (raw) 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 reply other threads:[~2019-02-01 6:05 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-01 6:04 Johannes Schindelin [this message] 2019-02-01 7:22 ` Johannes Schindelin 2019-02-01 9:26 ` Elijah Newren 2019-12-27 21:11 ` Alban Gruin 2019-12-27 22:45 ` Elijah Newren 2019-12-29 17:25 ` Alban Gruin 2020-01-02 20:17 ` Johannes Schindelin 2020-01-31 21:23 ` Johannes Schindelin 2020-04-01 11:33 ` Alban Gruin 2020-04-01 14:00 ` Phillip Wood 2020-04-04 20:33 ` Johannes Schindelin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=nycvar.QRO.7.76.6.1901312310280.41@tvgsbejvaqbjf.bet \ --to=johannes.schindelin@gmx.de \ --cc=git@vger.kernel.org \ --cc=newren@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git