{"thread":{"id":"65975","subject":"[PATCH] Makefile: fix up lib directory move","startedAt":"2026-07-10T18:38:47Z","lastAt":"2026-07-13T05:23:03Z","messageCount":5,"participants":["Ramsay Jones","Johannes Schindelin","Junio C Hamano","Patrick Steinhardt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"547792","messageId":"0c94331b-7eb1-4116-afa5-811082ad5854@ramsayjones.plus.com","threadId":"65975","inReplyTo":null,"subject":"[PATCH] Makefile: fix up lib directory move","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2026-07-10T18:38:44Z","receivedAt":"2026-07-10T18:38:47Z","isPatch":true,"body":"\nCommit 9759608622 (\"Move libgit.a sources into separate \"lib/\" directory\",\n2026-06-22) moved some files into a lib directory, but forgot to update\na sparse dependency in the Makefile, resulting in a sparse error:\n\n SP lib/pack-revindex.c\n lib/pack-revindex.c:78:17: error: memset with byte count of 262144\n make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1\n\nAdd the missing 'lib/' prefix to the pack-revindex.sp path.\n\nSigned-off-by: Ramsay Jones \n---\n\nHi Patrick,\n\nIf you need to re-roll your 'ps/libgit-in-subdir' branch, could you please squash\nthis into the relevant patch. (This patch was created directly on top of the 'seen'\nbranch, rather than on top of your branch).\n\nThanks\n\nATB,\nRamsay Jones\n\n\n Makefile | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Makefile b/Makefile\nindex 703772ba4f..a36d2c1942 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2974,7 +2974,7 @@ lib/gettext.sp lib/gettext.s lib/gettext.o: EXTRA_CPPFLAGS = \\\n http-push.sp lib/http.sp lib/http-walker.sp remote-curl.sp imap-send.sp: SP_EXTRA_FLAGS += \\\n \t-DCURL_DISABLE_TYPECHECK\n \n-pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count\n+lib/pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count\n \n ifdef NO_EXPAT\n lib/http-walker.sp lib/http-walker.s lib/http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT\n-- \n2.55.0\n"},{"id":"547884","messageId":"ef422523-1c50-ec79-e89a-f43f02ba1ca7@gmx.de","threadId":"65975","inReplyTo":"0c94331b-7eb1-4116-afa5-811082ad5854@ramsayjones.plus.com","subject":"Re: [PATCH] Makefile: fix up lib directory move","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2026-07-12T10:15:23Z","receivedAt":"2026-07-12T10:15:31Z","isPatch":true,"body":"Hi Ramsay,\n\nOn Fri, 10 Jul 2026, Ramsay Jones wrote:\n\n> Commit 9759608622 (\"Move libgit.a sources into separate \"lib/\" directory\",\n\nIt's not your fault, but this commit is no longer reachable from any\nofficial branch.\n\nMaybe a more stable way to refer to this right now would be to name the\ntopic: `ps/libgit-in-subdir`.\n\n> 2026-06-22) moved some files into a lib directory, but forgot to update\n> a sparse dependency in the Makefile, resulting in a sparse error:\n> \n> SP lib/pack-revindex.c\n> lib/pack-revindex.c:78:17: error: memset with byte count of 262144\n> make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1\n> \n> Add the missing 'lib/' prefix to the pack-revindex.sp path.\n\nThat reasoning and that patch make sense to me. Thank you!\n\n> \n> Signed-off-by: Ramsay Jones \n> ---\n> \n> Hi Patrick,\n> \n> If you need to re-roll your 'ps/libgit-in-subdir' branch, could you please squash\n> this into the relevant patch. (This patch was created directly on top of the 'seen'\n> branch, rather than on top of your branch).\n\nThat would be 8da3a2c01822 (Move libgit.a sources into separate \"lib/\"\ndirectory, 2026-07-01), at least at the time of writing (that commit is\nstill not merged into `next` and hence subject to be rewritten).\n\nCiao,\nJohannes\n\n> \n> Thanks\n> \n> ATB,\n> Ramsay Jones\n> \n> \n> Makefile | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/Makefile b/Makefile\n> index 703772ba4f..a36d2c1942 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -2974,7 +2974,7 @@ lib/gettext.sp lib/gettext.s lib/gettext.o: EXTRA_CPPFLAGS = \\\n> http-push.sp lib/http.sp lib/http-walker.sp remote-curl.sp imap-send.sp: SP_EXTRA_FLAGS += \\\n> \t-DCURL_DISABLE_TYPECHECK\n> \n> -pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count\n> +lib/pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count\n> \n> ifdef NO_EXPAT\n> lib/http-walker.sp lib/http-walker.s lib/http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT\n> -- \n> 2.55.0\n> \n> \n"},{"id":"547899","messageId":"94e744f1-12b1-4ba4-8f9b-266c1642b5ff@ramsayjones.plus.com","threadId":"65975","inReplyTo":"ef422523-1c50-ec79-e89a-f43f02ba1ca7@gmx.de","subject":"Re: [PATCH] Makefile: fix up lib directory move","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2026-07-12T13:35:55Z","receivedAt":"2026-07-12T13:36:03Z","isPatch":true,"body":"\n\nOn 12/07/2026 11:15 am, Johannes Schindelin wrote:\n> Hi Ramsay,\n> \n> On Fri, 10 Jul 2026, Ramsay Jones wrote:\n> \n>> Commit 9759608622 (\"Move libgit.a sources into separate \"lib/\" directory\",\n> \n> It's not your fault, but this commit is no longer reachable from any\n> official branch.\n\nAh, yes, sorry about that! :(\n\nI wrote this patch first, on Linux, when 'easing' myself back after the v2.55.0\nrelease. Then I found the cygwin failures ... :) When I eventually sent the cygwin\nemail, some days later, I just tacked this on without thinking.\n\n[Usually I send these kind of 'patches' within hours of the branch being published, so\nthat commit IDs are still 'fresh'. However, even such a small window is no guarantee,\nof course! :) ]\n\n> \n> Maybe a more stable way to refer to this right now would be to name the\n> topic: `ps/libgit-in-subdir`.\n\nIndeed. ;)\n\n>> 2026-06-22) moved some files into a lib directory, but forgot to update\n>> a sparse dependency in the Makefile, resulting in a sparse error:\n>>\n>> SP lib/pack-revindex.c\n>> lib/pack-revindex.c:78:17: error: memset with byte count of 262144\n>> make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1\n>>\n>> Add the missing 'lib/' prefix to the pack-revindex.sp path.\n> \n> That reasoning and that patch make sense to me. Thank you!\n> \n\nThanks!\n\nATB,\nRamsay Jones\n\n\n"},{"id":"547901","messageId":"xmqqbjcc5mro.fsf@gitster.g","threadId":"65975","inReplyTo":"ef422523-1c50-ec79-e89a-f43f02ba1ca7@gmx.de","subject":"Re: [PATCH] Makefile: fix up lib directory move","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-07-12T14:02:35Z","receivedAt":"2026-07-12T14:02:38Z","isPatch":true,"body":"Johannes Schindelin writes:\n\n> Hi Ramsay,\n>\n> On Fri, 10 Jul 2026, Ramsay Jones wrote:\n>\n>> Commit 9759608622 (\"Move libgit.a sources into separate \"lib/\" directory\",\n>\n> It's not your fault, but this commit is no longer reachable from any\n> official branch.\n>\n> Maybe a more stable way to refer to this right now would be to name the\n> topic: `ps/libgit-in-subdir`.\n\nYes, citing the object name alone would have been useless.\n\nOn the other hand, it is good to have it as a sanity-checking\nclue. If or when the patch does not apply cleanly, we can tell\nthat the fix-up was written based on an older iteration. The\n\"reference\" format used here carries more information than the\ntopic branch name alone, and with the commit title, we can run\n\n $ git show 'origin/seen^{/^Move libgit\\.a sources into}'\n\nwhen 9759608622 cannot be found.\n\n>> 2026-06-22) moved some files into a lib directory, but forgot to update\n>> a sparse dependency in the Makefile, resulting in a sparse error:\n>> \n>> SP lib/pack-revindex.c\n>> lib/pack-revindex.c:78:17: error: memset with byte count of 262144\n>> make: *** [Makefile:3446: lib/pack-revindex.sp] Error 1\n>> \n>> Add the missing 'lib/' prefix to the pack-revindex.sp path.\n>\n> That reasoning and that patch make sense to me. Thank you!\n\nYes, indeed. It is queued on top of the topic.\n\nThanks.\n"},{"id":"547940","messageId":"alR2MbquROPkcm1O@pks.im","threadId":"65975","inReplyTo":"0c94331b-7eb1-4116-afa5-811082ad5854@ramsayjones.plus.com","subject":"Re: [PATCH] Makefile: fix up lib directory move","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-07-13T05:22:57Z","receivedAt":"2026-07-13T05:23:03Z","isPatch":true,"body":"On Fri, Jul 10, 2026 at 07:38:44PM +0100, Ramsay Jones wrote:\n> If you need to re-roll your 'ps/libgit-in-subdir' branch, could you please squash\n> this into the relevant patch. (This patch was created directly on top of the 'seen'\n> branch, rather than on top of your branch).\n\nThanks, let me squash this in and send another version.\n\nPatrick\n"}]}