On Wed, Jan 12, 2022 at 11:50:11AM -0500, Rodrigo Vivi wrote: > git pull of git version 2.31.1 apparently prefers rebase > over merge.
duh! it was a Intel's dt script that changed my defaults on my back... (facepalm) I will remove from my config... but anyway I believe this might be a good protection from any config or git pull decision... So, please ignore the line above and consider this new commit message: on a v2: We should never run the pull with the rebase strategy. Ever. That messes up with our commits. Specially with the top one where dim expects a merge commit and it amends from and link info. So, let's forbid the rebase strategy overriding any user config. Cc: Jani Nikula <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Zhi Wang <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]> > > Then it messes up with our commits. Specially with the top > one where dim expects a merge commit and it amends from and > link info. > > No, git pull --rebase=merges didn't help and with a risk of > changing behavior for others and also messing with commit ids. > > So, let's inform git pull that we really don't want a rebase > here. > > Cc: Jani Nikula <[email protected]> > Cc: Daniel Vetter <[email protected]> > Cc: Zhi Wang <[email protected]> > Signed-off-by: Rodrigo Vivi <[email protected]> > --- > dim | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dim b/dim > index bbe9308..fb0dce9 100755 > --- a/dim > +++ b/dim > @@ -1188,7 +1188,7 @@ function dim_apply_pull > > checkpatch_commit_push_range 0 "HEAD..FETCH_HEAD" > > - if ! $DRY git pull --no-ff $pull_branch ; then > + if ! $DRY git pull --no-rebase --no-ff $pull_branch ; then > if ! check_conflicts "$pull_branch" ; then > echoerr "Please resolve and then commit normally using > git" > > -- > 2.31.1 >
