From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <dstolee@microsoft.com>, Jeff King <peff@peff.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Jonathan Tan <jonathantanmy@google.com>,
Taylor Blau <me@ttaylorr.com>,
gitster@pobox.com, Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 0/1] And so it begins...merge/rename performance work
Date: Wed, 13 Jan 2021 14:11:57 -0800 [thread overview]
Message-ID: <20210113221158.2869128-1-newren@gmail.com> (raw)
In-Reply-To: <20210108205111.2197944-1-newren@gmail.com>
This depends on a merge of en/ort-conflict-handling, en/diffcore-rename,
and en/ort-directory-rename.
Changes since v1:
* Add a step I forgot in my testcase setup -- increasing
merge.renameLimit
* Add Acked-by from Taylor
Elijah Newren (1):
merge-ort: begin performance work; instrument with trace2_region_*
calls
diffcore-rename.c | 8 +++++++
merge-ort.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
Range-diff:
1: 9542932eee ! 1: 8783f209ef merge-ort: begin performance work; instrument with trace2_region_* calls
@@ Commit message
$ git switch -c 5.4-renames v5.4
$ git mv drivers pilots # Introduce over 26,000 renames
$ git commit -m "Rename drivers/ to pilots/"
+ $ git config merge.renameLimit 30000
=== Testcases ===
@@ Commit message
is noticeably faster with merge-ort than with apply-based rebase.
Signed-off-by: Elijah Newren <newren@gmail.com>
+ Acked-by: Taylor Blau <ttaylorr@github.com>
## diffcore-rename.c ##
@@ diffcore-rename.c: void diffcore_rename(struct diff_options *options)
--
2.29.2.544.gecb49aa127.dirty
next prev parent reply other threads:[~2021-01-14 2:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 20:51 [PATCH 0/1] And so it begins...merge/rename performance work Elijah Newren
2021-01-08 20:51 ` [PATCH 1/1] merge-ort: begin performance work; instrument with trace2_region_* calls Elijah Newren
2021-01-08 20:59 ` Taylor Blau
2021-01-08 21:50 ` Elijah Newren
2021-01-08 21:55 ` Taylor Blau
2021-01-09 0:52 ` Elijah Newren
2021-01-13 22:11 ` Elijah Newren [this message]
2021-01-13 22:11 ` [PATCH v2 " Elijah Newren
2021-01-14 19:08 ` [PATCH v2 0/1] And so it begins...merge/rename performance work Junio C Hamano
2021-01-14 20:18 ` Elijah Newren
2021-01-15 19:29 ` [PATCH v3 " Elijah Newren
2021-01-15 19:29 ` [PATCH v3 1/1] merge-ort: begin performance work; instrument with trace2_region_* calls Elijah Newren
2021-01-24 6:01 ` [PATCH v4 0/3] And so it begins...merge/rename performance work Elijah Newren
2021-01-24 6:01 ` [PATCH v4 1/3] merge-ort: fix massive leak Elijah Newren
2021-01-24 19:11 ` Derrick Stolee
2021-01-24 6:01 ` [PATCH v4 2/3] merge-ort: ignore the directory rename split conflict for now Elijah Newren
2021-01-24 6:01 ` [PATCH v4 3/3] merge-ort: begin performance work; instrument with trace2_region_* calls Elijah Newren
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=20210113221158.2869128-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).