mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-30334
This commit is contained in:
commit
0233dc035f
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user