Optimization batch 9: avoid detecting irrelevant renames by newren · Pull Request #845 · gitgitgadget/git

newren · 2021-01-24T07:03:44Z

This series determines paths which meet special cases where detection
of renames is irrelevant, where the irrelevance is due to the fact
that the merge machinery will arrive at the same result regardless of
whether a rename is detected for any of those paths.

Changes since v2:

Added an extended comment about filtering order to the first patch, to address Stolee's question
Added a new testcase that will fail if the critical "if (content_relevant || location_relevant)" check only checks for one of those two or the intersection of those two, as suggested by Stolee
Fixed the other minor problems Stolee pointed out in his review (stray newline, wording of comment)

cc: Derrick Stolee dstolee@microsoft.com
cc: Jonathan Tan jonathantanmy@google.com
cc: Taylor Blau me@ttaylorr.com
cc: Junio C Hamano gitster@pobox.com
cc: Ævar Arnfjörð Bjarmason avarab@gmail.com
cc: Elijah Newren newren@gmail.com
cc: Derrick Stolee stolee@gmail.com

newren · 2021-02-28T03:57:19Z

/submit

gitgitgadget · 2021-02-28T03:59:00Z

Submitted as pull.845.git.1614484707.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git pr-845/newren/ort-perf-batch-9-v1

To fetch this version to local tag pr-845/newren/ort-perf-batch-9-v1:

git fetch --no-tags https://github.com/gitgitgadget/git tag pr-845/newren/ort-perf-batch-9-v1

gitgitgadget · 2021-03-22T00:40:11Z

This patch series was integrated into seen via git@217f038.

gitgitgadget · 2021-03-22T20:36:21Z

This patch series was integrated into seen via git@dcdea95.

gitgitgadget · 2021-03-22T21:30:58Z

This patch series was integrated into seen via git@c8f71b8.

gitgitgadget · 2021-03-23T00:53:17Z

This patch series was integrated into seen via git@4c3ff01.

gitgitgadget · 2021-03-23T03:49:27Z

There was a status update about the branch en/ort-perf-batch-9 on the Git mailing list:

The ort merge backend has been optimized by skipping irrelevant
renames.

gitgitgadget · 2021-03-23T23:36:31Z

This patch series was integrated into seen via git@d419527.

gitgitgadget · 2021-03-24T22:29:26Z

This patch series was integrated into seen via git@3d4cdfd.

gitgitgadget · 2021-03-26T22:54:42Z

This patch series was integrated into seen via git@e21f66d.

gitgitgadget · 2021-03-28T01:10:50Z

This patch series was integrated into seen via git@2571112.

gitgitgadget · 2021-03-28T07:04:14Z

This patch series was integrated into seen via git@f53ac67.

gitgitgadget · 2021-03-29T02:46:04Z

This patch series was integrated into seen via git@dacf9fb.

gitgitgadget · 2021-03-30T01:21:12Z

This patch series was integrated into seen via git@2c6478c.

gitgitgadget · 2021-03-30T22:26:20Z

This patch series was integrated into seen via git@40cd16d.

gitgitgadget · 2021-03-31T00:16:28Z

There was a status update about the branch en/ort-perf-batch-9 on the Git mailing list:

The ort merge backend has been optimized by skipping irrelevant
renames.

Will merge to 'next'.

gitgitgadget · 2021-03-31T22:20:51Z

This patch series was integrated into seen via git@e02194b.

gitgitgadget · 2021-04-02T06:10:21Z

This patch series was integrated into seen via git@187f96d.

gitgitgadget · 2021-04-02T06:10:22Z

This patch series was integrated into next via git@cc5254a.

gitgitgadget · 2021-04-02T23:31:05Z

This patch series was integrated into seen via git@3341158.

gitgitgadget · 2021-04-04T07:08:42Z

This patch series was integrated into seen via git@c512342.

gitgitgadget · 2021-04-06T01:28:07Z

There was a status update about the branch en/ort-perf-batch-9 on the Git mailing list:

The ort merge backend has been optimized by skipping irrelevant
renames.

Will merge to 'master'.

gitgitgadget · 2021-04-08T00:54:51Z

This patch series was integrated into seen via git@e7ceae4.

gitgitgadget · 2021-04-08T20:24:59Z

This patch series was integrated into seen via git@bf979f8.

gitgitgadget · 2021-04-08T22:30:29Z

This patch series was integrated into seen via git@1b31224.

gitgitgadget · 2021-04-08T22:30:30Z

This patch series was integrated into next via git@1b31224.

gitgitgadget · 2021-04-08T22:30:30Z

This patch series was integrated into master via git@1b31224.

gitgitgadget · 2021-04-08T22:30:33Z

Closed via 1b31224.

newren force-pushed the ort-perf-batch-9 branch from 5d8c73a to 1990a19 Compare January 25, 2021 16:11

newren force-pushed the temporary/ort-perf-batch-8 branch from 3bfbd40 to f3cda8d Compare January 28, 2021 00:16

newren force-pushed the ort-perf-batch-9 branch 3 times, most recently from e4a8539 to 0a72a5e Compare February 3, 2021 05:32

newren force-pushed the temporary/ort-perf-batch-8 branch from f3cda8d to c53920b Compare February 3, 2021 19:03

newren force-pushed the ort-perf-batch-9 branch 2 times, most recently from 69d8e51 to d33d841 Compare February 3, 2021 20:33

newren force-pushed the temporary/ort-perf-batch-8 branch from ac1fea5 to 4e99977 Compare February 9, 2021 10:33

newren force-pushed the ort-perf-batch-9 branch from d33d841 to 1f14fce Compare February 9, 2021 10:33

newren force-pushed the temporary/ort-perf-batch-8 branch from 4e99977 to d266fa7 Compare February 10, 2021 14:08

newren force-pushed the ort-perf-batch-9 branch 2 times, most recently from a6e7c2e to ec57808 Compare February 10, 2021 16:35

newren force-pushed the temporary/ort-perf-batch-8 branch from e546ae2 to e60bea9 Compare February 11, 2021 07:37

newren force-pushed the ort-perf-batch-9 branch from ec57808 to 043aba7 Compare February 11, 2021 07:37

newren force-pushed the temporary/ort-perf-batch-8 branch from e60bea9 to 81bcfc4 Compare February 12, 2021 17:29

newren force-pushed the ort-perf-batch-9 branch 2 times, most recently from 4f3d6a7 to 0d3c472 Compare February 12, 2021 21:12

newren force-pushed the temporary/ort-perf-batch-8 branch from 46774dc to 8b2286c Compare February 14, 2021 03:31

newren force-pushed the ort-perf-batch-9 branch 2 times, most recently from 4077b17 to 65ea72d Compare February 14, 2021 03:39

newren force-pushed the ort-perf-batch-9 branch from 65ea72d to 0c00d8e Compare February 23, 2021 21:29

newren force-pushed the temporary/ort-perf-batch-8 branch 2 times, most recently from 805c101 to bfab7ff Compare February 25, 2021 01:21

newren force-pushed the ort-perf-batch-9 branch 4 times, most recently from d40e692 to 8fed92b Compare February 27, 2021 06:17

gitgitgadget bot added the next label Apr 2, 2021

gitgitgadget bot added the master label Apr 8, 2021

gitgitgadget bot closed this Apr 8, 2021

newren deleted the ort-perf-batch-9 branch April 23, 2021 17:07

Conversation

newren commented Jan 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

newren commented Feb 28, 2021

Uh oh!

gitgitgadget bot commented Feb 28, 2021

Uh oh!

gitgitgadget bot commented Mar 22, 2021

Uh oh!

gitgitgadget bot commented Mar 22, 2021

Uh oh!

gitgitgadget bot commented Mar 22, 2021

Uh oh!

gitgitgadget bot commented Mar 23, 2021

Uh oh!

gitgitgadget bot commented Mar 23, 2021

Uh oh!

gitgitgadget bot commented Mar 23, 2021

Uh oh!

gitgitgadget bot commented Mar 24, 2021

Uh oh!

gitgitgadget bot commented Mar 26, 2021

Uh oh!

gitgitgadget bot commented Mar 28, 2021

Uh oh!

gitgitgadget bot commented Mar 28, 2021

Uh oh!

gitgitgadget bot commented Mar 29, 2021

Uh oh!

gitgitgadget bot commented Mar 30, 2021

Uh oh!

gitgitgadget bot commented Mar 30, 2021

Uh oh!

gitgitgadget bot commented Mar 31, 2021

Uh oh!

gitgitgadget bot commented Mar 31, 2021

Uh oh!

gitgitgadget bot commented Apr 2, 2021

Uh oh!

gitgitgadget bot commented Apr 2, 2021

Uh oh!

gitgitgadget bot commented Apr 2, 2021

Uh oh!

gitgitgadget bot commented Apr 4, 2021

Uh oh!

gitgitgadget bot commented Apr 6, 2021

Uh oh!

gitgitgadget bot commented Apr 8, 2021

Uh oh!

gitgitgadget bot commented Apr 8, 2021

Uh oh!

gitgitgadget bot commented Apr 8, 2021

Uh oh!

gitgitgadget bot commented Apr 8, 2021

Uh oh!

gitgitgadget bot commented Apr 8, 2021

Uh oh!

gitgitgadget bot commented Apr 8, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

newren commented Jan 24, 2021 •

edited

Loading