2.38.1 Build Version Confusion

2.38.1 Build Version Confusion

[rsbecker]

Hi Team,

When I build 2.38.1, I'm ending up with GIT-VERSION-FILE as follows:

$ cat GIT-VERSION-FILE
GIT_VERSION = 2.38.GIT

$ ./git version
git version 2.38.GIT

This seems a bit different from past patches. Is this intended?

Thanks,
Randall

--
Brief whoami: NonStop&UNIX developer since approximately
UNIX(421664400)
NonStop(211288444200000000)
-- In real life, I talk too much.

RE: 2.38.1 Build Version Confusion

[rsbecker]

On October 19, 2022 10:35 AM, I wrote:	
>When I build 2.38.1, I'm ending up with GIT-VERSION-FILE as follows:
>
>$ cat GIT-VERSION-FILE
>GIT_VERSION = 2.38.GIT
>
>$ ./git version
>git version 2.38.GIT
>
>This seems a bit different from past patches. Is this intended?

I should point out that I used the 'main' branch for this build.
-R

Re: 2.38.1 Build Version Confusion

[Junio C Hamano]

<rsbecker@nexbridge.com> writes:

> On October 19, 2022 10:35 AM, I wrote:	
>>When I build 2.38.1, I'm ending up with GIT-VERSION-FILE as follows:
>>
>>$ cat GIT-VERSION-FILE
>>GIT_VERSION = 2.38.GIT
>>
>>$ ./git version
>>git version 2.38.GIT

That is unexpected.

>>This seems a bit different from past patches. Is this intended?
>
> I should point out that I used the 'main' branch for this build.

Yes, you should.  You didn't build 2.38.1.

If you built 'main' (which does not really exist, by the way---I
push out 'master' to 'master' and to 'main' when I publish for
illusion), it has a lot of development towards the next feature
release plus whatever is in 'maint', and 2.38.GIT is expected.

"git checkout --detach v2.38.1" and build from there, and then you
can say "I built 2.38.1".  "git checkout maint" and building it
right now would also build 2.38.1 but that is only true until
'maint' gains more updates on top to prepare for 2.38.2.

HTH.

RE: 2.38.1 Build Version Confusion

[rsbecker]

On October 19, 2022 11:31 AM, Junio C Hamano wrote:
><rsbecker@nexbridge.com> writes:
>
>> On October 19, 2022 10:35 AM, I wrote:
>>>When I build 2.38.1, I'm ending up with GIT-VERSION-FILE as follows:
>>>
>>>$ cat GIT-VERSION-FILE
>>>GIT_VERSION = 2.38.GIT
>>>
>>>$ ./git version
>>>git version 2.38.GIT
>
>That is unexpected.
>
>>>This seems a bit different from past patches. Is this intended?
>>
>> I should point out that I used the 'main' branch for this build.
>
>Yes, you should.  You didn't build 2.38.1.
>
>If you built 'main' (which does not really exist, by the way---I push out
'master' to
>'master' and to 'main' when I publish for illusion), it has a lot of
development
>towards the next feature release plus whatever is in 'maint', and 2.38.GIT
is
>expected.
>
>"git checkout --detach v2.38.1" and build from there, and then you can say
"I built
>2.38.1".  "git checkout maint" and building it right now would also build
2.38.1 but
>that is only true until 'maint' gains more updates on top to prepare for
2.38.2.

I am going to change our build process to be specific in terms of tags
instead of using branch names from here on.

Thanks,
Randall

Re: 2.38.1 Build Version Confusion

[Taylor Blau]

On Wed, Oct 19, 2022 at 10:34:30AM -0400, rsbecker@nexbridge.com wrote:
> Hi Team,
>
> When I build 2.38.1, I'm ending up with GIT-VERSION-FILE as follows:
>
> $ cat GIT-VERSION-FILE
> GIT_VERSION = 2.38.GIT
>
> $ ./git version
> git version 2.38.GIT
>
> This seems a bit different from past patches. Is this intended?

If you're building on the current tip of 'master' (at the time of
writing: 9c32cfb49c (Sync with v2.38.1, 2022-10-17)), then yes.

In d5b41391a4 (Git 2.38.1, 2022-10-05), the contents of GIT-VERSION-GEN
contained "DEF_VER=v2.38.1", but it was reset in 9c32cfb49c to
"v2.38.GIT" to indicate that we are in a development cycle.

You can see where Junio resolved the merge conflict more clearly with:

    $ git show --remerge-diff 9c32cfb49c60fa8173b9666db02efe3b45a8522f

Thanks,
Taylor