{"thread":{"id":"62801","subject":"'seen' branch identifies as v2.48.0","startedAt":"2025-01-14T01:19:12Z","lastAt":"2025-01-15T03:26:40Z","messageCount":4,"participants":["Ramsay Jones","Junio C Hamano","Patrick Steinhardt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"510464","messageId":"6c5d0f90-79f0-4fba-8edb-f80d0665873b@ramsayjones.plus.com","threadId":"62801","inReplyTo":null,"subject":"'seen' branch identifies as v2.48.0","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2025-01-14T01:16:01Z","receivedAt":"2025-01-14T01:19:12Z","isPatch":false,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"Hi Junio,\n\nWhen building git from tonight's seen branch, it claims to be version 2.48.0,\nthus:\n\n $ pwd\n /home/ramsay/git\n $ \n \n $ ./git version\n git version 2.48.0\n $ \n \n $ git describe\n v2.48.0-246-g568b3e75e9\n $ \n \n $ git log -1\n commit 568b3e75e9cc62870cace4e290d7c2bd3241e3e5 (HEAD -> seen, origin/seen)\n Merge: 1a6fedb381 20d77dd0a5\n Author: Junio C Hamano \n Date: Mon Jan 13 10:20:35 2025 -0800\n \n Merge branch 'ps/zlib-ng' into seen\n \n * ps/zlib-ng:\n compat/zlib: allow use of zlib-ng as backend\n git-zlib: cast away potential constness of `next_in` pointer\n compat/zlib: provide stubs for `deflateSetHeader()`\n compat/zlib: provide `deflateBound()` shim centrally\n git-compat-util: move include of \"compat/zlib.h\" into \"git-zlib.h\"\n compat: introduce new \"zlib.h\" header\n git-compat-util: drop `z_const` define\n compat: drop `uncompress2()` compatibility shim\n $ \n \n $ cat GIT-VERSION\n v2.48.0\n $ \n \nAn additional wrinkle on cygwin is that, after having built git (or more\nprecisely git-version.exe) then 'make sparse' and 'make hdr-check' spew to\nstderr, like:\n\n /home/ramsay/git/GIT-VERSION-GEN: line 27: warning: command substitution: \\\n ignored null byte in input \n\nwhich is caused by GIT-VERSION, git-version and git-version.exe being 'seen'\nas the same file on cygwin (case insensitive filessytem + cygwin 'magic'):\n\n $ ls -l GIT-VERSION\n -rwxr-xr-x 140 ramsay None 21M Jan 14 00:05 GIT-VERSION*\n $ \n \n $ file GIT-VERSION\n GIT-VERSION: PE32+ executable (console) x86-64, for MS Windows, 19 sections\n $ \n \n $ ls -l *version*\n -rwxr-xr-x 140 ramsay None 21M Jan 14 00:05 git-version.exe*\n -rw-r--r-- 1 ramsay None 3.4K Jan 13 23:49 version.c\n -rw-r--r-- 1 ramsay None 619 Jan 13 23:49 version.h\n -rw-r--r-- 1 ramsay None 50 Jan 14 00:24 version.hcc\n -rw-r--r-- 1 ramsay None 21K Jan 14 00:13 version.o\n -rw-r--r-- 1 ramsay None 0 Jan 14 00:13 version.sp\n -rw-r--r-- 1 ramsay None 5.4K Dec 24 14:03 versioncmp.c\n -rw-r--r-- 1 ramsay None 118 Sep 8 21:39 versioncmp.h\n -rw-r--r-- 1 ramsay None 53 Jan 14 00:24 versioncmp.hcc\n -rw-r--r-- 1 ramsay None 15K Jan 13 23:59 versioncmp.o\n -rw-r--r-- 1 ramsay None 0 Jan 14 00:13 versioncmp.sp\n -rw-r--r-- 1 ramsay None 199 Jan 14 00:13 version-def.h\n -rw-r--r-- 1 ramsay None 207 Dec 16 19:08 version-def.h.in\n $ \n\nI normally like to find solutions before posting problems to the list, but\nunfortunately I don't have time to look into this at the moment. Sorry!\n\nJust a heads up.\n\nATB,\nRamsay Jones\n\n \n"},{"id":"510469","messageId":"xmqqr0566u60.fsf@gitster.g","threadId":"62801","inReplyTo":"6c5d0f90-79f0-4fba-8edb-f80d0665873b@ramsayjones.plus.com","subject":"Re: 'seen' branch identifies as v2.48.0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-01-14T01:49:59Z","receivedAt":"2025-01-14T01:50:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramsay Jones writes:\n\n> $ cat GIT-VERSION\n> v2.48.0\n> $ \n\nThis came from semantic mismerge with Patrick's latest round of\nbuild updates. Usually I try to review very critically parts of a\nseries that can negatively affect those users who do *not* use a new\nfeature each topic tries to add or improve, and it means for this\ntopic, if it breaks builds that do not involve meson, it would\nautomatically qualify the topic to be ejected from the tree (side\nnote: if a breakage is for those who use meson, as long as it is not\nas grave as running an equivalent of \"sudo rm -fr /\", I'll let it\nthrough), but this time because there was no textual conflict, the\nhardcoded GIT-VERSION unfortunately went through.\n\nI however somehow thought that those who are building from a\nrepository should get \"git describe\" name instead of the hardcoded\nfallback name in GIT-VERSION. At least, it is my understanding that\nis the intent of that series. Or are you building from a tarball\nextract?\n\n> I normally like to find solutions before posting problems to the list, but\n> unfortunately I don't have time to look into this at the moment. Sorry!\n>\n> Just a heads up.\n\nI'd throw it back at Patrick, at least for tonight; the topic is\nmore or less hot off the press and it should not be surprising it it\nneeded immediate fix-up and reroll.\n\nThanks.\n"},{"id":"510481","messageId":"Z4YXjCrtjCUjkEql@pks.im","threadId":"62801","inReplyTo":"xmqqr0566u60.fsf@gitster.g","subject":"Re: 'seen' branch identifies as v2.48.0","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2025-01-14T07:51:40Z","receivedAt":"2025-01-14T07:51:45Z","isPatch":false,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Mon, Jan 13, 2025 at 05:49:59PM -0800, Junio C Hamano wrote:\n> Ramsay Jones writes:\n> > I normally like to find solutions before posting problems to the list, but\n> > unfortunately I don't have time to look into this at the moment. Sorry!\n> >\n> > Just a heads up.\n> \n> I'd throw it back at Patrick, at least for tonight; the topic is\n> more or less hot off the press and it should not be surprising it it\n> needed immediate fix-up and reroll.\n\nYup, found the issue. The next version of the Meson series will have it\nfixed. Thanks for the report!\n\nPatrick\n"},{"id":"510553","messageId":"8c3ae215-5d78-4ad6-a068-701499646580@ramsayjones.plus.com","threadId":"62801","inReplyTo":"Z4YXjCrtjCUjkEql@pks.im","subject":"Re: 'seen' branch identifies as v2.48.0","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2025-01-15T03:26:31Z","receivedAt":"2025-01-15T03:26:40Z","isPatch":false,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"Hi Patrick, Junio,\n\nOn 14/01/2025 07:51, Patrick Steinhardt wrote:\n> On Mon, Jan 13, 2025 at 05:49:59PM -0800, Junio C Hamano wrote:\n>> Ramsay Jones writes:\n[snip]\n\n> Yup, found the issue. The next version of the Meson series will have it\n> fixed. Thanks for the report!\n\nI suspect you already know, but I can confirm that tonight's 'seen' branch\nbuilds fine (Linux and Cygwin).\n\n[Sorry for being so late, but I had to wait for about 3 hours for windoze\nupdate to stop making my laptop *totally* unusable! :( ]\n\nThanks!\n\nATB,\nRamsay Jones\n\n"}]}