The branch main has been updated by bz:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3f115b864b1fba951ce60970b5febb4e593b1f77

commit 3f115b864b1fba951ce60970b5febb4e593b1f77
Author:     Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2023-11-28 19:09:07 +0000
Commit:     Bjoern A. Zeeb <b...@freebsd.org>
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

Reply via email to