From nobody Mon Apr 15 17:55:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJFFW1W3Tz5H3G4; Mon, 15 Apr 2024 17:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJFFW10f9z4GYr; Mon, 15 Apr 2024 17:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713203727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d6/O8oZJnEgCijNSAAldTiL9ysC+cFV9zx4ayLP8A3Q=; b=dHGYgiPdob08HkRJS6FBBu0mSu3LL9DIWi9Q3PoF5aW5m8SUEv/rjKf3Y29LU+jps5mR0Q tJ4ycpyZdbXZ+jYGAausuOd57OiOFEdby0kZKTokiQpTjY6eEBcwO95WgqrvcyG1GLDvAb 5o/IYU4VsCip3yBMy3SdUrMJg0wItEXYPQRnGSpFazNGOzVDM0gRTGqTnHbjE93G4c/Xtl X6g5Nyasqczov66Hz2+O9lNPKSWZT8cuipwNl3UzivuSou3Q419gnbcVA98lkWQQNPFQz7 vpD2kF7YZLw2Jz39eqDIsFtkrJtcHt8yrXIq5RpznEQEDP7hLF5AhcmJcUEV2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713203727; a=rsa-sha256; cv=none; b=DVf5BcOXvQ7QS7bBIOwqpBcRSPnq8UftSxrLtnL1Z1dCgzvcuH6xzjHkgcVCeEoFIfNiSi mfbq46O1Ig+kNNtee4NYCA1tRlcBIw06+C62d2uy+xdoxmg6fBblzM9p6x6vp5I2R5DfvS aKwO21VDjDJ+Y4wKKroJAzzph3HoDT2JsGk7WqFlv7kifaJqjrTEhGo8cgTd6kPa3+//ul VU9mmZNYg0hBMzAB0p3vudwxlfNqNwMchw4w8W53cpWiXjlWSoMDO9VRv+WtMy6hSFDyrU QftVUadOy9AjbwYu5bppMGtXiNr2yubD0M4hz2u+kbC8h4saqne5oX6Wn4FK3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713203727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d6/O8oZJnEgCijNSAAldTiL9ysC+cFV9zx4ayLP8A3Q=; b=wJs8kHPjeGsnrbfteguoGli4c1d/tZmdGG4R/C7lNcchhSS1RjZrdXYd9yypsq6l5LGVjm vNoNmtHcMtDicqOf5VAzIHbS0s1O9LNS8XMHldWikmDYFBS0xU3YiiODz5jo/DaczpcNsS 4872TtVBsppghWPn8EyYFruZ3Hr7lmt+kLwXxKgM3BZnXlZRiNBVjVX9Nncxsqzn0RnI3m u0qE+YD/YXNJAuoEYE1bM3DP0l7wRjZ39QdLCRDwL9e29NgovLvWw66bL4aHR/7U4uIN/W ECvrayOrxnNoeF9t0PC333F8y+hlIdE0f19KkT1WtlRK0WeMWZvNyBTkBRHLRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJFFW0L61z18mq; Mon, 15 Apr 2024 17:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43FHtQld058295; Mon, 15 Apr 2024 17:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FHtQtV058292; Mon, 15 Apr 2024 17:55:26 GMT (envelope-from git) Date: Mon, 15 Apr 2024 17:55:26 GMT Message-Id: <202404151755.43FHtQtV058292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3f115b864b1f - main - git/mfc-candidates.sh: allow comments in exclude file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f115b864b1fba951ce60970b5febb4e593b1f77 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f115b864b1fba951ce60970b5febb4e593b1f77 commit 3f115b864b1fba951ce60970b5febb4e593b1f77 Author: Bjoern A. Zeeb AuthorDate: 2023-11-28 19:09:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 17:54:42 +0000 git/mfc-candidates.sh: allow comments in exclude file As branches ages, the list of unmerged or unmergable changes may grow longer. In some cases it is helpful to group and or annotate them in an exclude file. Filtering out lines starting with "#" allows adding comment lines to aid tracking. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42790 --- tools/tools/git/mfc-candidates.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index 76ff9b4d53c6..d7fd4b5ded13 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -141,6 +141,9 @@ commits_to() canonicalize_hashes() { while read hash rest; do + case "${hash}" in + "#"*) continue ;; + esac if ! git show --pretty=%H --no-patch $hash; then echo "error parsing hash list" >&2 exit 1