Hi Junio, On Sat, 18 May 2024, Johannes Schindelin wrote: > On Sat, 18 May 2024, Junio C Hamano wrote: > > > I have applied this to maint-2.39 and then merged them up to the > > maintenance tracks. The results will be pushed out to the "split > > out" repository at > > > > https://github.com/gitster/git/ > > > > as these branches: > > > > js/fix-clone-w-hooks-2.39 > > js/fix-clone-w-hooks-2.40 > > js/fix-clone-w-hooks-2.41 > > js/fix-clone-w-hooks-2.42 > > js/fix-clone-w-hooks-2.43 > > js/fix-clone-w-hooks-2.44 > > js/fix-clone-w-hooks-2.45 > > Thank you! > > As it happens, I had already worked on tentative/maint-* branches (that > you can see here: https://github.com/dscho/git/branches/active), but > had to take a break before finalizing them. > > The major difference I see is that js/fix-clone-w-hooks-2.41 still > declares `do_files_match()` in `setup.h` (even if it is no longer defined > or called), and that `hook.c` includes `copy.h` (but that is no longer > needed), and that `setup.h` includes `hook.h` (but that's not needed > either). > > While comparing, I noticed that I had missed an extra empty line in my > merge conflict resolutions, a `grep` -> `test_grep` conversation and an > `UNUSED` attribute for the `ctx` parameter of the `safe_hook_cb()` > function. So I am really grateful that you did those integrations > independently. > > You will also note that I tentatively added commits to mark v2.39.5, ..., > v2.45.2 ready for tagging, along with release notes, just so we can hit > the ground running as soon as reviews settle down. Oh, I forgot to mention that I also integrated backports of some CI fixes into the `tentative/maint-*` branches, to let the `osx-gcc` job pass again. Ciao, Johannes >
