From ccc180667f60f5966656ee98bd5b541ffb2a5033 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Wed, 8 Jul 2026 16:19:44 +0100 Subject: [PATCH 1/2] tools: add check for Reviewed-by: to merge.sh Signed-off-by: Stewart X Addison --- tools/actions/merge.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/actions/merge.sh b/tools/actions/merge.sh index 45947f64c2a4db..e92f45441b2217 100755 --- a/tools/actions/merge.sh +++ b/tools/actions/merge.sh @@ -56,6 +56,11 @@ git log -1 HEAD^ --pretty='format:%B' | git interpret-trailers --parse --no-divi echo "Refuse to squash and merge a PR landing in more than one commit" exit 1 } +git log -1 HEAD --pretty='format:%B' | git interpret-trailers --parse --no-divider | \ + grep -q "^Reviewed-By: " || { + echo "No Reviewed-By: lines in the commit message" + exit 1 + } commit_title=$(git log -1 --pretty='format:%s') commit_body=$(git log -1 --pretty='format:%b') From 7f944e6c0ad9c7b3b82df733706315ea02728753 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 9 Jul 2026 12:37:45 +0100 Subject: [PATCH 2/2] Adjust messages to suggest git node land Signed-off-by: Stewart X Addison --- tools/actions/merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/actions/merge.sh b/tools/actions/merge.sh index e92f45441b2217..b151000275ee2b 100755 --- a/tools/actions/merge.sh +++ b/tools/actions/merge.sh @@ -48,7 +48,7 @@ fi git log -1 HEAD --pretty='format:%B' | git interpret-trailers --parse --no-divider | \ grep -q -x "^PR-URL: https://github.com/$OWNER/$REPOSITORY/pull/$pr$" || { - echo "Invalid PR-URL trailer" + echo "Invalid PR-URL trailer - have you run 'git node land' to add it?" exit 1 } git log -1 HEAD^ --pretty='format:%B' | git interpret-trailers --parse --no-divider | \ @@ -58,7 +58,7 @@ git log -1 HEAD^ --pretty='format:%B' | git interpret-trailers --parse --no-divi } git log -1 HEAD --pretty='format:%B' | git interpret-trailers --parse --no-divider | \ grep -q "^Reviewed-By: " || { - echo "No Reviewed-By: lines in the commit message" + echo "No Reviewed-By: lines in the commit message - have you run 'git node land' to add them?" exit 1 }