From af95e7dcc86a66e3db74cefe5e7b221b6e2a59a8 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 11 Oct 2017 10:51:18 +0200
Subject: [PATCH] dim: enforce consistent conflictstyle in drm-tip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise the tree rebuilding fails. This might be the reason why some
git versions create different conflicts, since checking
git-sources/rerere.c didn't provide any hint at all about what has
changed.
Note this is only --local, i.e. for the current git repo, not --global
or --system. But with worktrees that includes a lot more than just the
drm-tip repo. But then we just force the default, so hopefully the
impact is minimal.
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
dim | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dim b/dim
index 449e12e..f83f91f 100755
--- a/dim
+++ b/dim
@@ -652,6 +652,10 @@ function dim_rebuild_tip
exit 1
fi
+ # rerere uses sha1 of the diff to identify conflicts, we must ensure
+ # that they look the same for everyone
+ git config merge.conflictstyle merge
+
for repo in "${!drm_tip_repos[@]}"; do
remote=$(repo_to_remote $repo)
echo -n "Fetching $repo (local remote $remote)... "
--
GitLab