From owner-dev-commits-src-main@freebsd.org Fri Jan 22 09:57:16 2021 Return-Path: Delivered-To: dev-commits-src-main@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 582D74EF4E7; Fri, 22 Jan 2021 09:57:16 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (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 4DMZRw1p2kz4dN4; Fri, 22 Jan 2021 09:57:16 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wr1-x42e.google.com with SMTP id v15so4468182wrx.4; Fri, 22 Jan 2021 01:57:15 -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=9u0P5rlBPVP4gMC6tXPOgJpp2r6QOvX/ktdPHRA/8hI=; b=tkhh0nW9S8tjZyJCbNym+P+mjGzTO5+HSMTO7vPOPvGPIkR/SgnjqDlqGqqBRU2wHt mnD7Ax3fkekw5jjCEM+iB85rJnNwqbTxn0ZE5BQBAtMMw9BxFijiUencU1QOcbcrsfe7 8Teu07e6VIaYssBdV6rXbqrXxS0rflwGW7oGLEJCC/pMldDUWMxgHTZU6Cd7P2092AVu CPlC43bJW6vuGsGEJkRdPLE1cZXi0zUjA7X0ZxeQLlEd3FLrY+xGGCr3PTN93eTRuxvi EVQyoJf4OUVPFaZSBGks61WmlqGd6uRCVnpA0P3ZyPEOqNzfBubuhR5PgT/yGIJZYgoe 25lg== 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=9u0P5rlBPVP4gMC6tXPOgJpp2r6QOvX/ktdPHRA/8hI=; b=kBihXZk0E4Vzp47GyrE08KOjZsoT4jlAJYPiVcciFOf6Db1W5Gk1TCRifX2TqvZ+VZ n0NK4gYKR2vwRhGYqOtXq2OYFgr1ZEYXFrmhK4QTuQZC27YtSGEGyjGq23xUsf5imbMV wTH7tkUeSCSnnFsUK6iEAb1LacIQB9g0rDYb0bZPnRA68gUyZCnoEsVL1o0109OZNX9Z eippSWC4P2HYxpTxSZNjMS2tUpT0h5+Xr8ltZyJ8S4u132gd4TmZ84TsAHXp6J2paBnx xguhBcggGeqlW3DAZuaS7oGJCRhDs6UCV2Ocf8o8COWdNLzxyhq66qcvNEaxgm0teQZC qYxg== X-Gm-Message-State: AOAM533jnouTYs+VOh7QY8cY8vduyqZskS48c3lr/sceigSLwQ+pASVI sycs59rzKmgmVHIzSomy7w9ol6ZPWge9vlj4iM+8jQzTDQQ= X-Google-Smtp-Source: ABdhPJwpPCAZNxF3lIeMBu8iUpnLlRQMA3Nh927TiKtLnYtVLFTbtN/EjFAMLjVy26+6J8Payoy6lUok7xcA2/wP+Es= X-Received: by 2002:a05:6000:186f:: with SMTP id d15mr3667326wri.237.1611309434373; Fri, 22 Jan 2021 01:57:14 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a5d:464c:0:0:0:0:0 with HTTP; Fri, 22 Jan 2021 01:57:12 -0800 (PST) In-Reply-To: References: <202101200949.10K9nmkZ029085@gitrepo.freebsd.org> <49353415-D1B2-43D5-AC39-EF64F03EE512@freebsd.org> From: Mateusz Guzik Date: Fri, 22 Jan 2021 10:57:12 +0100 Message-ID: Subject: Re: git: a9fc14fbf445 - main - newvers.sh: add support for gitup(1) To: Ed Maste Cc: Jessica Clarke , =?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: 4DMZRw1p2kz4dN4 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-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 09:57:16 -0000 So can someone sort this out? stable/13 just got created and it does not have the branch name. On 1/21/21, Ed Maste wrote: >> > This fixes the problem at hand, > > Thanks for confirming, I've fixed that part now. > >> > 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. > > I agree, and my suggestion is that we restore it unconditionally. I > think it's more confusing without a consistent format / set of > components. > -- Mateusz Guzik