File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -200,11 +200,17 @@ export current_rmq_ref
200200
201201ifeq ($(origin base_rmq_ref ) ,undefined)
202202ifneq ($(wildcard .git) ,)
203+ possible_base_rmq_ref := v3.6.x
204+ ifeq ($(possible_base_rmq_ref ) ,$(current_rmq_ref ) )
205+ base_rmq_ref := $(current_rmq_ref )
206+ else
203207base_rmq_ref := $(shell \
204- (git rev-parse --verify -q stable >/dev/null && \
205- git merge-base --is-ancestor $$(git merge-base master HEAD ) stable && \
206- echo stable) || \
208+ (git rev-parse --verify -q master >/dev/null && \
209+ git rev-parse --verify -q $(possible_base_rmq_ref ) >/dev/null && \
210+ git merge-base --is-ancestor $$(git merge-base master HEAD ) $(possible_base_rmq_ref ) && \
211+ echo $(possible_base_rmq_ref ) ) || \
207212 echo master)
213+ endif
208214else
209215base_rmq_ref := master
210216endif
You can’t perform that action at this time.
0 commit comments