From owner-dev-commits-src-all@freebsd.org Thu Jan 21 15:16:38 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 670CA4F6E43; Thu, 21 Jan 2021 15:16:38 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DM5Zt2CMcz4WFj; Thu, 21 Jan 2021 15:16:38 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wm1-x32d.google.com with SMTP id m187so1766609wme.2; Thu, 21 Jan 2021 07:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=b4DvCpHcXWa0906Mze3WjQNCpfAwGxOsS8G59j5B5LY=; b=Y17b/0rvIwtVK8jJ3dbDYzfq++x506GzpSyxgEPlTYJiJ6j9M+RHajYYvGuEQetYJ0 nmE0jh4Bh8OM4zxNgM/quXwCHVjYgH2rbnIaQT97oGkx8VZWkQcJtgcD+k4d5Jk7dFpi E1KBLKaHZB/9LsrP3en0rM8s6c7IueUIktA/NwA54yjCshDj/irbafO7by7ivoXOr0E1 YfpbvmrmzzifJboy2jE49PIqlQAMp8xSW1PhbNW86qYrZ/1izvazzw1KyCfuMqbs1CWK hcwp3syE2NOI+hfAziApyCUCgSjkMGqnEB9KYItz258OWtrzgrpzGeTwOXNKsUkEZGSL rhGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=b4DvCpHcXWa0906Mze3WjQNCpfAwGxOsS8G59j5B5LY=; b=O6yEE5DWNK8M1TLwGqH4iR8LfI2Fb2Ps3BmOynJKUl2LcoONhBkjBs3myQG4YtRUNC Jzlp70ZeZkJ1gB6yn8AMMwAu7JDfkjlVN1i5jPnwgcQVQoZRQ6F1FJZlEl3AY3Jt7wq3 AdAp5jqm9fzC4ewnT82hrQD0bzgbrtmGS8fFX8BJFcHrcDFGQW+Vf1MYmbmAOE0OVsau worVQLDzCM7Rd2r2bG2SMzCK3vjEeYbT5n5O1CXNiQQdJ12dY7VpVUCgZEAS2HV8t6pM Kavrt/305aLKlqjwAZanRRwO7GendHGH8znrix0THqaDx2jxKnOWLQtRII+ksSvqNqw1 AQdg== X-Gm-Message-State: AOAM533sinqojk4AWqx9sZEcRXdx8jjbQIhhLyeKJ61mnPr/1aQ9mENr CEj9rmRNYo+zBGHo1lUd5V5sxZs9My0bjroe/0ZphGgVsE4= X-Google-Smtp-Source: ABdhPJxy2Z+azr1tzWRdnFwUQLyJLNW8tKjph4ZnPZwp4SkmGkwEGkAlvy5jbiXNJ4N/0rFpc3G9C0ySuWRotey9Bss= X-Received: by 2002:a1c:68d5:: with SMTP id d204mr9413470wmc.178.1611242195809; Thu, 21 Jan 2021 07:16:35 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a5d:464c:0:0:0:0:0 with HTTP; Thu, 21 Jan 2021 07:16:34 -0800 (PST) In-Reply-To: <49353415-D1B2-43D5-AC39-EF64F03EE512@freebsd.org> References: <202101200949.10K9nmkZ029085@gitrepo.freebsd.org> <49353415-D1B2-43D5-AC39-EF64F03EE512@freebsd.org> From: Mateusz Guzik Date: Thu, 21 Jan 2021 16:16:34 +0100 Message-ID: Subject: Re: git: a9fc14fbf445 - main - newvers.sh: add support for gitup(1) To: Jessica Clarke Cc: Ed Maste , =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DM5Zt2CMcz4WFj X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 15:16:38 -0000 On 1/21/21, Jessica Clarke wrote: > On 21 Jan 2021, at 14:32, Mateusz Guzik wrote: >> On 1/21/21, Ed Maste wrote: >>> On Thu, 21 Jan 2021 at 05:37, Mateusz Guzik 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