From owner-dev-commits-src-all@freebsd.org Sat Dec 26 10:52:58 2020 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 A29DF4B5534 for ; Sat, 26 Dec 2020 10:52:58 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-yb1-f169.google.com (mail-yb1-f169.google.com [209.85.219.169]) (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 4D30yf41Wmz3NvK for ; Sat, 26 Dec 2020 10:52:58 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-yb1-f169.google.com with SMTP id k4so5785196ybp.6 for ; Sat, 26 Dec 2020 02:52:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=bJ5JWajMeFv/fvxzPGrQLhv5sKAW2wx0HvfNjShVuws=; b=fxo7od33nu3+OuFLVUnK8iH228JKRHCgvJNLuvds3KnXarnZcsM6puRFUq+IMslP98 a3/pO7+hdnD0E6G/4tuta8/tDAgqEKV60FAeIWysEO6wc0BTsV9cjFK2r0sk4HhAvHmH 2OYVFB6v9iBbMaEf71luNvtW+MwA9OkbZzNruEMxKAvnRMxuXWVO5t8OfzJZJkmYygBs FF/yCHoZgGZXP6ST5Nxe0wZJj2oVSxQ2bb2mx5sJyYlmW16sE5/sc8Y9YHy8WMCV19TX SZ/fVkE94PjH+kAwrBdZE2HVZ1fCtDwu03GDfq+C8c8Iuq1gIDdCMbufx/8qaIhAZ1+I QT1w== X-Gm-Message-State: AOAM532ExMcuBy1d74WXD2t0Tk9u2bvzQl7j8Secs9ppwD9AOJg3aKPX lPnXjfpUffpgSFh/R4xl49K0jRa1Y5BUEC/tBa1gWA8o1OLyBg== X-Google-Smtp-Source: ABdhPJx/k7ZN65yTD+s1Dx2CDAmIXUJLG1Xap0YT9aD+UtHD8KsU0hbhmFHpKoOZtTiIWzsC73l5XYWTdqQ22Xh311A= X-Received: by 2002:a05:6902:728:: with SMTP id l8mr52905400ybt.399.1608979977151; Sat, 26 Dec 2020 02:52:57 -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: <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sat, 26 Dec 2020 11:52:45 +0100 Message-ID: Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): To: Stefan Esser , lwhsu@freebsd.org, git@freebsd.org Cc: Yuri Pankov , Warner Losh X-Rspamd-Queue-Id: 4D30yf41Wmz3NvK X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Mailman-Approved-At: Sat, 26 Dec 2020 10:59:22 +0000 Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Sat, 26 Dec 2020 10:52:58 -0000 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), 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. Cheers Uli