[PATCH] Makefile: fix up lib directory move

[PATCH] Makefile: fix up lib directory move

[Ramsay Jones]

Commit 9759608622 ("Move libgit.a sources into separate "lib/" directory",
2026-06-22) moved some files into a lib directory, but forgot to update
a sparse dependency in the Makefile, resulting in a sparse error:

      SP lib/pack-revindex.c
  lib/pack-revindex.c:78:17: error: memset with byte count of 262144
  make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1

Add the missing 'lib/' prefix to the pack-revindex.sp path.

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

Hi Patrick,

If you need to re-roll your 'ps/libgit-in-subdir' branch, could you please squash
this into the relevant patch. (This patch was created directly on top of the 'seen'
branch, rather than on top of your branch).

Thanks

ATB,
Ramsay Jones


 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 703772ba4f..a36d2c1942 100644
--- a/Makefile
+++ b/Makefile
@@ -2974,7 +2974,7 @@ lib/gettext.sp lib/gettext.s lib/gettext.o: EXTRA_CPPFLAGS = \
 http-push.sp lib/http.sp lib/http-walker.sp remote-curl.sp imap-send.sp: SP_EXTRA_FLAGS += \
 	-DCURL_DISABLE_TYPECHECK
 
-pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count
+lib/pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count
 
 ifdef NO_EXPAT
 lib/http-walker.sp lib/http-walker.s lib/http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
-- 
2.55.0

Re: [PATCH] Makefile: fix up lib directory move

[Johannes Schindelin]

Hi Ramsay,

On Fri, 10 Jul 2026, Ramsay Jones wrote:

> Commit 9759608622 ("Move libgit.a sources into separate "lib/" directory",

It's not your fault, but this commit is no longer reachable from any
official branch.

Maybe a more stable way to refer to this right now would be to name the
topic: `ps/libgit-in-subdir`.

> 2026-06-22) moved some files into a lib directory, but forgot to update
> a sparse dependency in the Makefile, resulting in a sparse error:
> 
>       SP lib/pack-revindex.c
>   lib/pack-revindex.c:78:17: error: memset with byte count of 262144
>   make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1
> 
> Add the missing 'lib/' prefix to the pack-revindex.sp path.

That reasoning and that patch make sense to me. Thank you!

> 
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
> 
> Hi Patrick,
> 
> If you need to re-roll your 'ps/libgit-in-subdir' branch, could you please squash
> this into the relevant patch. (This patch was created directly on top of the 'seen'
> branch, rather than on top of your branch).

That would be 8da3a2c01822 (Move libgit.a sources into separate "lib/"
directory, 2026-07-01), at least at the time of writing (that commit is
still not merged into `next` and hence subject to be rewritten).

Ciao,
Johannes

> 
> Thanks
> 
> ATB,
> Ramsay Jones
> 
> 
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 703772ba4f..a36d2c1942 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2974,7 +2974,7 @@ lib/gettext.sp lib/gettext.s lib/gettext.o: EXTRA_CPPFLAGS = \
>  http-push.sp lib/http.sp lib/http-walker.sp remote-curl.sp imap-send.sp: SP_EXTRA_FLAGS += \
>  	-DCURL_DISABLE_TYPECHECK
>  
> -pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count
> +lib/pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count
>  
>  ifdef NO_EXPAT
>  lib/http-walker.sp lib/http-walker.s lib/http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
> -- 
> 2.55.0
> 
> 

Re: [PATCH] Makefile: fix up lib directory move

[Ramsay Jones]

On 12/07/2026 11:15 am, Johannes Schindelin wrote:
> Hi Ramsay,
> 
> On Fri, 10 Jul 2026, Ramsay Jones wrote:
> 
>> Commit 9759608622 ("Move libgit.a sources into separate "lib/" directory",
> 
> It's not your fault, but this commit is no longer reachable from any
> official branch.

Ah, yes, sorry about that! :(

I wrote this patch first, on Linux, when 'easing' myself back after the v2.55.0
release. Then I found the cygwin failures ... :) When I eventually sent the cygwin
email, some days later, I just tacked this on without thinking.

[Usually I send these kind of 'patches' within hours of the branch being published, so
that commit IDs are still 'fresh'. However, even such a small window is no guarantee,
of course! :) ]

> 
> Maybe a more stable way to refer to this right now would be to name the
> topic: `ps/libgit-in-subdir`.

Indeed. ;)

>> 2026-06-22) moved some files into a lib directory, but forgot to update
>> a sparse dependency in the Makefile, resulting in a sparse error:
>>
>>       SP lib/pack-revindex.c
>>   lib/pack-revindex.c:78:17: error: memset with byte count of 262144
>>   make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1
>>
>> Add the missing 'lib/' prefix to the pack-revindex.sp path.
> 
> That reasoning and that patch make sense to me. Thank you!
> 

Thanks!

ATB,
Ramsay Jones

Re: [PATCH] Makefile: fix up lib directory move

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Ramsay,
>
> On Fri, 10 Jul 2026, Ramsay Jones wrote:
>
>> Commit 9759608622 ("Move libgit.a sources into separate "lib/" directory",
>
> It's not your fault, but this commit is no longer reachable from any
> official branch.
>
> Maybe a more stable way to refer to this right now would be to name the
> topic: `ps/libgit-in-subdir`.

Yes, citing the object name alone would have been useless.

On the other hand, it is good to have it as a sanity-checking
clue.  If or when the patch does not apply cleanly, we can tell
that the fix-up was written based on an older iteration.  The
"reference" format used here carries more information than the
topic branch name alone, and with the commit title, we can run

    $ git show 'origin/seen^{/^Move libgit\.a sources into}'

when 9759608622 cannot be found.

>> 2026-06-22) moved some files into a lib directory, but forgot to update
>> a sparse dependency in the Makefile, resulting in a sparse error:
>> 
>>       SP lib/pack-revindex.c
>>   lib/pack-revindex.c:78:17: error: memset with byte count of 262144
>>   make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1
>> 
>> Add the missing 'lib/' prefix to the pack-revindex.sp path.
>
> That reasoning and that patch make sense to me. Thank you!

Yes, indeed.  It is queued on top of the topic.

Thanks.

Re: [PATCH] Makefile: fix up lib directory move

[Patrick Steinhardt]

On Fri, Jul 10, 2026 at 07:38:44PM +0100, Ramsay Jones wrote:
> If you need to re-roll your 'ps/libgit-in-subdir' branch, could you please squash
> this into the relevant patch. (This patch was created directly on top of the 'seen'
> branch, rather than on top of your branch).

Thanks, let me squash this in and send another version.

Patrick