git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: 2.38.1 Build Version Confusion

From
Taylor Blau <me@ttaylorr.com>
Date
Oct 19, 2022, 15:06 UTC
Message-ID
<Y1ASY4aQfW4n8xA8@nand.local>
In-Reply-To
<01cd01d8e3c7$e93bff50$bbb3fdf0$@nexbridge.com>
On Wed, Oct 19, 2022 at 10:34:30AM -0400, rsbecker@nexbridge.com wrote:
Show 11 quoted lines
> 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

Previous: rsbecker@nexbridge.com
Message 5 of 5 in “2.38.1 Build Version Confusion”
  1. rsbecker@nexbridge.comOct 19, 2022
  2. rsbecker@nexbridge.comOct 19, 2022
  3. Junio C HamanoOct 19, 2022
  4. rsbecker@nexbridge.comOct 19, 2022
  5. Taylor BlauOct 19, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.