Commit 6659ebf6 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

apply-pull: Never rebase git pull, never rebase



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 <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1bb53de2
Pipeline #484154 passed with stages
in 37 seconds
......@@ -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"
......
Supports Markdown
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