fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-30334
This commit is contained in:
Stephane Nicoll 2022-03-20 08:50:14 +01:00
commit 0233dc035f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/hooks/forward-merge
View File

@ -18,7 +18,7 @@ class ForwardMerge
end end
def find_forward_merges(message_file) 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 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