On Wed, Oct 19, 2022 at 10:34:30AM -0400, rsbecker@xxxxxxxxxxxxx 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
