On 18/04/2025 18:40, Junio C Hamano wrote: > Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes: > >> Commit 8b0b5c7046 (p5312: removed duplicate performance test script, >> 2025-04-17) removed the 't/perf/p5312-pack-bitmaps-revs.sh' script, but >> forgot to remove it from 't/meson.build', resulting in a broken build. >> >> In order to fix the build, remove the script from 't/meson.build'. > > Thanks. > > >> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> >> --- >> >> Hi Taylor, Junio, >> >> If you need to re-roll the 'tb/pack-bitmap-lookup-tables' branch, could >> you please squash this into commit 8b0b5c7046. (the meson build on the >> current 'seen' branch is broken otherwise). > > Unless the topic by Tayor gets rebased on top of what contains > ps/meson-build-perf-bench, which is not even in 'next' (hence I > wouldn't recommend doing such a rebase), this needs to be dealt with > as an evil-merge semantic conflict fix-up, which I did this morning > and pushed the result out. Ah, yes, I just fetched and found your fixup (which you did hours ago!). Sorry for the noise. Thanks. ATB, Ramsay Jones
