From owner-freebsd-git@freebsd.org Sat Dec 26 19:58:07 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 BCC904C16C1 for ; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3F3g4gPMz4dYP for ; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9E7B84C16C0; Sat, 26 Dec 2020 19:58:07 +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 9E4A34C191F for ; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3F3g3t3bz4dms; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 783352A5E4; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f178.google.com with SMTP id j17so6548380ybt.9; Sat, 26 Dec 2020 11:58:07 -0800 (PST) X-Gm-Message-State: AOAM531zjUCb2rBJvfIM2FGVm4631I37gUmE8uChdvl0Eu3D8Am+tyAg XW35U/VI2cQ4cgDAQT6yl+y7K7iW1KPzRcObBD8= X-Google-Smtp-Source: ABdhPJzKeSf8szmqWr0YwHso7Ng9i0I9JTzRSFiZjdf4KaSbKQTiN/ZlJuECWJIPu9gR2hy5wzyo36a/vtyT5GsgzDQ= X-Received: by 2002:a25:c845:: with SMTP id y66mr51236885ybf.110.1609012687084; Sat, 26 Dec 2020 11:58:07 -0800 (PST) MIME-Version: 1.0 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> In-Reply-To: From: Li-Wen Hsu Date: Sun, 27 Dec 2020 03:57:55 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Stefan Esser , git@freebsd.org, Yuri Pankov , Warner Losh Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 19:58:07 -0000 On Sat, Dec 26, 2020 at 6:53 PM Ulrich Sp=C3=B6rlein wrot= e: > > 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 com= mit >> >> message would be good as well... Where appropriate is approximately w= hat >> >> 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, an= y >> > 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", s= ee: https://svnweb.freebsd.org/base/svnadmin/hooks/scripts/mailer.py?revision= =3D320410&view=3Dmarkup#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. Best, Li-Wen