Merge branch '2.6.x' into 2.7.x

Closes gh-30334
2022-03-20 08:50:14 +01:00 · 2022-03-20 08:50:14 +01:00 · 0233dc035f
parent f05c19a40a 1cfebc0d39
commit 0233dc035f
1 changed files with 1 additions and 1 deletions
--- a/git/hooks/forward-merge
+++ b/git/hooks/forward-merge
@ -18,7 +18,7 @@ class ForwardMerge
 end

 def find_forward_merges(message_file)
-  $log.debug "Searching for for forward merge"
+  $log.debug "Searching for forward merge"
  rev=`git rev-parse -q --verify MERGE_HEAD`.strip
  $log.debug "Found #{rev} from git rev-parse"
  return nil unless rev