From 4034725e38da23bdd5ceb9da3bbfdfb578543aff Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 3 Apr 2025 14:38:16 -0700 Subject: [PATCH] Skip forward merge checks on docs-build branch --- git/hooks/forward-merge | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/git/hooks/forward-merge b/git/hooks/forward-merge index b3da876d09f..7e3e03c5545 100755 --- a/git/hooks/forward-merge +++ b/git/hooks/forward-merge @@ -18,7 +18,14 @@ class ForwardMerge end def find_forward_merges(message_file) + $log.debug "Searching for forward merge" + branch=`git rev-parse -q --abbrev-ref HEAD`.strip + $log.debug "Found #{branch} from git rev-parse --abbrev-ref" + if( branch == "docs-build") then + $log.debug "Skipping docs build" + return nil + end rev=`git rev-parse -q --verify MERGE_HEAD`.strip $log.debug "Found #{rev} from git rev-parse" return nil unless rev