Date: Thu, 21 Jan 2021 16:16:34 +0100 From: Mateusz Guzik <mjguzik@gmail.com> To: Jessica Clarke <jrtc27@freebsd.org> Cc: Ed Maste <emaste@freebsd.org>, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a9fc14fbf445 - main - newvers.sh: add support for gitup(1) Message-ID: <CAGudoHEOr_acBgcDE%2BqLx%2BEXp7Ps=x84rTb0knSDufBQ_r3bNA@mail.gmail.com> In-Reply-To: <49353415-D1B2-43D5-AC39-EF64F03EE512@freebsd.org> References: <202101200949.10K9nmkZ029085@gitrepo.freebsd.org> <CAGudoHG9KGDH0d23d6F1pCmfApYGFc37ZYmK-gxqgY3Ua_80CA@mail.gmail.com> <CAPyFy2C7jFAP27OW2zHAwoWHpnWpEQTU7tkVpJcMWgTfTGQPHQ@mail.gmail.com> <CAGudoHF8=G1u7n4iQg-DLGGZ7i4Y-5rzgSTHxKs6mS_r2AXD4A@mail.gmail.com> <49353415-D1B2-43D5-AC39-EF64F03EE512@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 1/21/21, Jessica Clarke <jrtc27@freebsd.org> wrote:
> On 21 Jan 2021, at 14:32, Mateusz Guzik <mjguzik@gmail.com> wrote:
>> On 1/21/21, Ed Maste <emaste@freebsd.org> wrote:
>>> On Thu, 21 Jan 2021 at 05:37, Mateusz Guzik <mjguzik@gmail.com> wrote:
>>>>
>>>> I'm getting an error with this:
>>>>
>>>> $ make -s buildkernel MODULES_OVERRIDE=""
>>>>
>>>> /tank/users/mjg/src/freebsd/sys/conf/newvers.sh: git: not found
>>>>
>>>>> + if [ "$(git rev-parse --is-shallow-repository)" = false ] ; then
>>> ^^^
>>> Looks like this bare git should be $git_cmd, can you confirm that
>>> change fixes it?
>>
>> This fixes the problem at hand, but a new regression is shown:
>>
>> $ strings kernel | grep 'FreeBSD 13.0-ALPHA1'
>> FreeBSD 13.0-ALPHA1 #47 c256181-gb06e91d1b700: Thu Jan 21 14:31:35 UTC
>> 2021
>>
>> branch name is no longer present.
>
> See the commit message, though I'd argue it's not redundant in a lot of
> local development cases (i.e. anything other than main, stable/*, etc),
> and is actually rather useful.
>
right
While here, drop the redundant branch name from the git output and don't
count commits in shallow clones.
That's definitely a regression. If the branch name is really seen a
spurious (why?), then perhaps it can be only skipped if name == main
--
Mateusz Guzik <mjguzik gmail.com>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGudoHEOr_acBgcDE%2BqLx%2BEXp7Ps=x84rTb0knSDufBQ_r3bNA>