Commit 7d4df0ed authored by Jani Nikula's avatar Jani Nikula

dim: expect git backmerge to be called on an upstream branch

Upstream branches are defined by dim list-upstreams. Allow override for
when the user knows what they're doing.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula's avatarJani Nikula <jani.nikula@intel.com>
parent 53b023cf
......@@ -922,6 +922,10 @@ function dim_backmerge
branch=${1:?$usage}
upstream=${2:?$usage}
if ! dim_list_upstreams | grep -q "^$upstream\$"; then
warn_or_fail "$upstream is not an upstream branch"
fi
cd $DIM_PREFIX/drm-tip
tip_remote=$(repo_to_remote drm-tip)
git fetch -q $tip_remote || true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment