[PATCH] dim: force merge commit for backmerges

[Daniel Vetter]

On Wed, Aug 11, 2021 at 10:13 AM Jani Nikula
<jani.nikula at linux.intel.com> wrote:
>
> On Mon, 02 Aug 2021, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> > We have all these remainders to actually type a commit message, but
> > --no-commit doesn't imply --no-ff, so let's fix that.
>
> *reminders
>
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>

Fixed and pushed, thanks for taking a look.
-Daniel

>
>
> >
> > Noticed because Maarten managed to do a fast-forward backmerge into
> > drm-misc-next somehow.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> > ---
> >  dim | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/dim b/dim
> > index 56463eb0c0a6..b3016d921a1a 100755
> > --- a/dim
> > +++ b/dim
> > @@ -1240,7 +1240,7 @@ function dim_backmerge
> >
> >       validate_upstream_baseline $branch $upstream
> >
> > -     git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || true
> > +     git merge --rerere-autoupdate --no-commit --no-ff $upstream >& /dev/null || true
> >
> >       patch_file=$(git_dir)/MERGE_MSG
>
> --
> Jani Nikula, Intel Open Source Graphics Center



-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch