All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] t/meson.build: remove deleted performance test script
@ 2025-04-18 16:59 Ramsay Jones
  2025-04-18 17:40 ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: Ramsay Jones @ 2025-04-18 16:59 UTC (permalink / raw)
  To: GIT Mailing-list; +Cc: Junio C Hamano, Taylor Blau


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'.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

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).

Thanks!

ATB,
Ramsay Jones
 
 t/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/t/meson.build b/t/meson.build
index 6eeb10d616..97e6d62228 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -1132,7 +1132,6 @@ benchmarks = [
   'perf/p5304-prune.sh',
   'perf/p5310-pack-bitmaps.sh',
   'perf/p5311-pack-bitmaps-fetch.sh',
-  'perf/p5312-pack-bitmaps-revs.sh',
   'perf/p5313-pack-objects.sh',
   'perf/p5314-name-hash.sh',
   'perf/p5326-multi-pack-bitmaps.sh',
-- 
2.49.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] t/meson.build: remove deleted performance test script
  2025-04-18 16:59 [PATCH] t/meson.build: remove deleted performance test script Ramsay Jones
@ 2025-04-18 17:40 ` Junio C Hamano
  2025-04-18 18:52   ` Ramsay Jones
  0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2025-04-18 17:40 UTC (permalink / raw)
  To: Ramsay Jones; +Cc: GIT Mailing-list, Taylor Blau

Ramsay Jones <ramsay@ramsayjones.plus.com> 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@ramsayjones.plus.com>
> ---
>
> 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] t/meson.build: remove deleted performance test script
  2025-04-18 17:40 ` Junio C Hamano
@ 2025-04-18 18:52   ` Ramsay Jones
  2025-04-18 19:51     ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: Ramsay Jones @ 2025-04-18 18:52 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: GIT Mailing-list, Taylor Blau



On 18/04/2025 18:40, Junio C Hamano wrote:
> Ramsay Jones <ramsay@ramsayjones.plus.com> 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@ramsayjones.plus.com>
>> ---
>>
>> 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




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] t/meson.build: remove deleted performance test script
  2025-04-18 18:52   ` Ramsay Jones
@ 2025-04-18 19:51     ` Junio C Hamano
  0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2025-04-18 19:51 UTC (permalink / raw)
  To: Ramsay Jones; +Cc: GIT Mailing-list, Taylor Blau

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

>>> 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.

I very much appreciate your being on the lookout for any breakages.
Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-04-18 19:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-18 16:59 [PATCH] t/meson.build: remove deleted performance test script Ramsay Jones
2025-04-18 17:40 ` Junio C Hamano
2025-04-18 18:52   ` Ramsay Jones
2025-04-18 19:51     ` Junio C Hamano

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.