From: Taylor Blau <me@ttaylorr.com>
To: rsbecker@nexbridge.com
Cc: git@vger.kernel.org
Subject: Re: 2.38.1 Build Version Confusion
Date: Wed, 19 Oct 2022 11:06:11 -0400 [thread overview]
Message-ID: <Y1ASY4aQfW4n8xA8@nand.local> (raw)
In-Reply-To: <01cd01d8e3c7$e93bff50$bbb3fdf0$@nexbridge.com>
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
prev parent reply other threads:[~2022-10-19 15:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 14:34 2.38.1 Build Version Confusion rsbecker
2022-10-19 15:01 ` rsbecker
2022-10-19 15:31 ` Junio C Hamano
2022-10-19 16:25 ` rsbecker
2022-10-19 15:06 ` Taylor Blau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y1ASY4aQfW4n8xA8@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=rsbecker@nexbridge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).