@@ -41,7 +41,7 @@ cover letter included an ASCII diagram of the shape that triggers the
4141pathology: a repository import that grafts a separate history with its
4242own root commit. When the walk from one side reaches a commit with a
4343very low generation number that the other side never paints, the walk
44- is forced to drain nearly the whole graph before it can convince itself
44+ is forced to drain almost the whole graph before it can convince itself
4545that it is done. Any merge that introduces a low-generation commit
4646never painted by the other side has the same effect.
4747
@@ -101,7 +101,7 @@ to be reformatted per the coding guidelines, questioned whether the
101101` pq ` field name was wise when it could stand for either ` prio_queue ` or
102102` paint_queue ` , and made a suggestion that shaped the rest of the
103103series: rather than testing the termination condition in the loop body,
104- ` paint_queue_get() ` should return NULL when it detects that no further
104+ ` paint_queue_get() ` should return ` NULL ` when it detects that no further
105105merge base can be found, so that the loop has a single exit. He
106106preferred ` !count ` over summing counters and comparing to zero, too.
107107
@@ -126,7 +126,7 @@ the algorithm as it already existed, and the tests came before the code
126126changes so they could be shown passing with the old logic. The
127127` ahead_behind() ` patch was dropped, the new struct was renamed from
128128` paint_queue ` to ` paint_state ` , and all termination conditions moved
129- into ` paint_queue_get() ` as Stolee had asked .
129+ into ` paint_queue_get() ` as Stolee had suggested .
130130
131131The most useful addition was one Stolee had implicitly asked for by
132132requesting better "data gathering": a ` trace2_data_intmax() ` call
@@ -200,7 +200,7 @@ date ordering would break the optimization.
200200The second addition was much bolder: removing the commit-date ordering
201201fallback introduced by 091f4cf3 (commit: don't use generation numbers
202202if not needed, 2018-08-30). That fallback existed because v1
203- commit-graphs, which store topological levels rather than corrected
203+ commit-graphs, which stored topological levels rather than corrected
204204commit dates, could make ` git merge-base v4.8 v4.9 ` on the Linux
205205kernel walk 636k commits instead of 167k. Side exhaustion solves the
206206same problem far better. Kristofer measured the step count for that
@@ -302,7 +302,7 @@ Beyond the speedups themselves, which will be most visible to anyone
302302working in a large monorepo or a repository with a grafted import, the
303303discussion left Git with three lasting artefacts: a new
304304` Documentation/technical/paint-down-to-common.adoc ` explaining an
305- algorithm that had never been written down, trace2 step-count
305+ algorithm that had never been written down, ` trace2 ` step-count
306306instrumentation that makes future work on the paint walk measurable
307307without benchmarking wall-clock time, and one fewer special case, now
308308that the 2018 commit-date ordering fallback has been removed and the
0 commit comments