From 6e406f06944da6fe55f6d3ded8c2f3ef970320fa Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 11 Jan 2021 09:23:09 +0100 Subject: [PATCH] Framework: properly ensure stable with upstream set --- Mk/defaults.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mk/defaults.mk b/Mk/defaults.mk index 8ae42c7a4..8c3a2696d 100644 --- a/Mk/defaults.mk +++ b/Mk/defaults.mk @@ -91,6 +91,8 @@ ${_TARGET}_ARG= ${${_TARGET}_ARGS:[0]} ensure-stable: @if ! git show-ref --verify --quiet refs/heads/stable/${PLUGIN_ABI}; then \ git update-ref refs/heads/stable/${PLUGIN_ABI} refs/remotes/origin/stable/${PLUGIN_ABI}; \ + git config branch.stable/${PLUGIN_ABI}.merge refs/heads/stable/${PLUGIN_ABI}; \ + git config branch.stable/${PLUGIN_ABI}.remote origin; \ fi diff: ensure-stable