[PATCH] dim: make update-branches update drm-next

Rodrigo Vivi rodrigo.vivi at intel.com
Thu Mar 1 18:14:52 UTC 2018


On Thu, Mar 01, 2018 at 05:39:36PM +0200, Jani Nikula wrote:
> On Thu, 01 Mar 2018, Joonas Lahtinen <joonas.lahtinen at linux.intel.com> wrote:
> > Update drm-next branch if it exists, to avoid incomplete backmerges.
> 
> Oh, so you did the backmerge from the *local* branch instead of
> drm-upstream/drm-next? Don't do that then...!
> 
> Should we prevent backmerges from local branches in dim?

+1 for preventing anything from local branches.

> 
> > Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> > Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> > ---
> >  dim | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/dim b/dim
> > index ed26033f5aba..071e8d019156 100755
> > --- a/dim
> > +++ b/dim
> > @@ -1862,6 +1862,12 @@ function dim_update_branches
> >  		dim_checkout drm-intel-next
> >  		$DRY git reset --hard $intel_remote/drm-intel-next
> >  	fi
> > +	if git_branch_exists drm-next ; then
> > +		drm_remote=$(repo_to_remote drm-upstream)
> > +
> > +		dim_checkout drm-next
> > +		$DRY git reset --hard $drm_remote/drm-next
> > +	fi
> 
> I guess
> 
> 	for branch in drm-intel-next drm-next; do
>         	if git_branch_exists $branch; then
>                 	...
>                 fi
>         done

+1 for also update local drm-next anyways.

> 
> seems better.
> 
> BR,
> Jani.
> 
> >  
> >  	cd $DIM_PREFIX/maintainer-tools
> >  	if git_is_current_branch maintainer-tools ; then
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools


More information about the dim-tools mailing list