Browse Source

Skip forward merge checks on docs-build branch

pull/45009/head
Phillip Webb 9 months ago
parent
commit
4034725e38
  1. 7
      git/hooks/forward-merge

7
git/hooks/forward-merge

@ -18,7 +18,14 @@ class ForwardMerge
end end
def find_forward_merges(message_file) def find_forward_merges(message_file)
$log.debug "Searching for forward merge" $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 rev=`git rev-parse -q --verify MERGE_HEAD`.strip
$log.debug "Found #{rev} from git rev-parse" $log.debug "Found #{rev} from git rev-parse"
return nil unless rev return nil unless rev

Loading…
Cancel
Save