Re: What's cooking in git.git (Dec 2021, #01; Fri, 3)
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Dec 6, 2021, 19:13 UTC
- Message-ID
- <e1aadd47-533c-fd8b-4fae-f64a53c81ec9@gmail.com>
- In-Reply-To
- <xmqqh7bpqhf0.fsf@gitster.g>
On 04/12/2021 01:37, Junio C Hamano wrote:
Show 41 quoted lines
> This is probably the first issue of the "What's cooking" report, in > which all topics have some sort of description. > > That's a small achievement, at least for me. > > Even better, each and every topic is annotated with some sort of > verdict (like "Will discard", "Expecting a reroll", "Will merge to > 'next'?" etc.). There is no topic in the "Undecided" category when > this report is fed to "cook -w" script (found in the 'todo' branch). > > A handful of topics are added to 'next', and we have about 40 topics > cooking there. For them, the future is automated---they spend about > a week in 'next', and if we find issues in them, we incrementally > improve them, or get merged to 'master'. > > Then we have about a dozen topics that are marked for 'next' (please > raise your hand if you have objection before a real damage is done), > and 8 more that may be ready for 'next' (please raise your hand if > you want to nudge them in either direction, for or against). >[...] > * pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits > - rebase -m: don't fork git checkout > - rebase --apply: set ORIG_HEAD correctly > - rebase --apply: fix reflog > - reset_head(): take struct rebase_head_opts > - rebase: cleanup reset_head() calls > - reset_head(): make default_reflog_action optional > - reset_head(): factor out ref updates > - reset_head(): remove action parameter > - reset_head(): don't run checkout hook if there is an error > - reset_head(): fix checkout > - rebase: factor out checkout for up to date branch > - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head > > Fix "some issues" in a helper function reset_head(). > > Will discard. > This needs a lot better explanation, including what the issues are, > which codepaths the helper is used in and to do what, and tests to > protect the fixes. > source: <pull.1049.git.1633082702.gitgitgadget@gmail.com>
I've got a re-roll which I think is almost ready but feel free to drop it in the meantime.
Show 22 quoted lines
> * pw/diff-color-moved-fix (2021-10-27) 15 commits > - diff --color-moved: intern strings > - diff: use designated initializers for emitted_diff_symbol > - diff --color-moved-ws=allow-indentation-change: improve hash lookups > - diff --color-moved: stop clearing potential moved blocks > - diff --color-moved: shrink potential moved blocks as we go > - diff --color-moved: unify moved block growth functions > - diff --color-moved: call comparison function directly > - diff --color-moved-ws=allow-indentation-change: simplify and optimize > - diff: simplify allow-indentation-change delta calculation > - diff --color-moved: avoid false short line matches and bad zerba coloring > - diff --color-moved=zebra: fix alternate coloring > - diff --color-moved: rewind when discarding pmb > - diff --color-moved: factor out function > - diff --color-moved: clear all flags on blocks that are too short > - diff --color-moved: add perf tests > > Long-overdue correctness and performance update to "diff > --color-moved" feature. > > Need to pick up the reroll before merging to 'next'. > cf. <pull.981.v4.git.1637056178.gitgitgadget@gmail.com>
Dscho spotted a typo which I was going to correct with a re-roll but I've been holding off in case he has time to read the rest of the series.
Best Wishes
Phillip