On Tue, Mar 06, 2018 at 11:32:05AM +0200, Jani Nikula wrote: > Upstream branches are defined by dim list-upstreams. Allow override for > when the user knows what they're doing. > > Cc: Daniel Vetter <[email protected]> > Cc: Joonas Lahtinen <[email protected]> > Cc: Rodrigo Vivi <[email protected]> > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]> > --- > dim | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dim b/dim > index 65d82417c407..45aec403a44e 100755 > --- a/dim > +++ b/dim > @@ -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 > -- > 2.11.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
