Date: Thu, 21 Jan 2021 14:41:24 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Mateusz Guzik <mjguzik@gmail.com> 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: <49353415-D1B2-43D5-AC39-EF64F03EE512@freebsd.org> In-Reply-To: <CAGudoHF8=G1u7n4iQg-DLGGZ7i4Y-5rzgSTHxKs6mS_r2AXD4A@mail.gmail.com> References: <202101200949.10K9nmkZ029085@gitrepo.freebsd.org> <CAGudoHG9KGDH0d23d6F1pCmfApYGFc37ZYmK-gxqgY3Ua_80CA@mail.gmail.com> <CAPyFy2C7jFAP27OW2zHAwoWHpnWpEQTU7tkVpJcMWgTfTGQPHQ@mail.gmail.com> <CAGudoHF8=G1u7n4iQg-DLGGZ7i4Y-5rzgSTHxKs6mS_r2AXD4A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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. Jess
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49353415-D1B2-43D5-AC39-EF64F03EE512>