On Tue, Apr 30, 2024 at 01:03:50PM -0700, Junio C Hamano wrote: > Taylor Blau <me@xxxxxxxxxxxx> writes: > > > - Rebased onto 2.45, so this is now based on 'master', which is at > > 786a3e4b8d (Git 2.45, 2024-04-29) at the time of writing. > > Is there any notable reason for the rebase (other than "2.45 is out > now") that needs to be called out? Something along the lines of > "topic X and Y has graduated and the helper function used by this > topic has changed its external interface"? It's mostly that 2.45 is out, but there were a couple of topics that merged that produced minor conflicts that I wanted to resolve for you: - 625ef1c6f1 (Merge branch 'tb/t7700-fixup', 2024-04-16) introduced a minor conflict (both sides add GIT_TEST_MULTI_PACK_INDEX=0 to the relevant test invocations). - d8360a86ed (Merge branch 'tb/midx-write', 2024-04-12) introduced a conflict where this branch adds a call to the new `bitmap_writer_init()` function in midx.c, but tb/midx-write moved all of that code over to midx-write.c Those are the two main ones, but I mostly just wanted to take care of it since we're on the other side of 2.45. > Thanks, queued. Thanks, Taylor
