From owner-freebsd-git@freebsd.org Sat Dec 26 20:24:00 2020 Return-Path: Delivered-To: freebsd-git@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 8EE7B4C1A69 for ; Sat, 26 Dec 2020 20:24:00 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3FdX3WzZz4gMW for ; Sat, 26 Dec 2020 20:24:00 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 774B34C1A68; Sat, 26 Dec 2020 20:24:00 +0000 (UTC) Delivered-To: git@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 7714E4C2068 for ; Sat, 26 Dec 2020 20:24:00 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3FdX24DTz4gS1; Sat, 26 Dec 2020 20:24:00 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BQKNvvI042249 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 26 Dec 2020 21:23:57 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 26 Dec 2020 21:23:57 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Li-Wen Hsu Cc: Stefan Esser , git@freebsd.org, Yuri Pankov , Warner Losh Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): Message-ID: References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D3FdX24DTz4gS1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 20:24:00 -0000 On Sun, 2020-12-27 at 03:57:55 +0800, Li-Wen Hsu wrote: >On Sat, Dec 26, 2020 at 6:53 PM Ulrich Spörlein wrote: >> >> On Sat, Dec 26, 2020 at 9:50 AM Stefan Esser wrote: >>> >>> Am 26.12.20 um 06:36 schrieb Yuri Pankov: >>> > Warner Losh wrote: >>> >> I was rather hoping we'd land around using the old commit message, as >>> >> is, and let the cherry-picked message at the end signify the MFC, at >>> >> least for simple cherry-picks. >>> >> >>> >> For squashed ones, a sensible new summary line and an appropriate commit >>> >> message would be good as well... Where appropriate is approximately what >>> >> we do today, with all the hashes that we're merging mentioned. >>> > >>> > I am following the docs (and those make sense to me), `git cherry-pick >>> > -x` is just enough; if it's direct commit, I'd add a note. So yes, any >>> > commit to stable/* is MFC, unless stated otherwise. >>> >>> I'd like to get back the branch in the subject line, not only the first >>> line of the commit message: >>> >>> It used to be: "svn commit: r368706 - in stable/12:", but now we only >>> have the git hash in the subject line and "The branch ... has been >>> updated ..." in the first line of the commit message. >>> >>> Filtering out commits to -STABLE/RELENG is possible via "X-Git-Refname" >>> (I hope this header line will be kept in exactly the current form to >>> not require later adjustment of the filter), > >This header line will be kept unless there is a very good reason. > >>> but it is no longer easy >>> to see whether a commit affects -CURRENT by just looking at the subject >>> line of the commit message ... >>> >>> Regards, STefan >>> >> >> I agree. Especially since you cannot filter on X-Git-Refname in Gmail :( >> >> Having the subject be: git: hash - branch-name - one-line-subject >> >> would be ideal and mimic previous behaviour better. > >This has just been deployed. Hope this helps. > >BTW, the original "branch" of the subject in svn is actually "commondir", see: > >https://svnweb.freebsd.org/base/svnadmin/hooks/scripts/mailer.py?revision=320410&view=markup#l509 > >And there is only X-SVN-Commit-Paths in header, contains list of >directories modified. > >I think having a branch name in the header and subject does help as we >now have a single list for all non-main branches. I'm not sure if >having the dirlist added in header and subject, or even body may help, >but if people find it's useful, I'm happy to see if it is possible to >port to our git system. Thank you for the quick fix! No, adding commondir isn't all that useful, in SVN it was needed as a single rev could span multiple "branches", but that's not the case in git. And we should become a little better in that first-line commit summary to obsolete further needs for commondir magic anyway. Thanks Uli