[PATCH] dim: enforce consistent conflictstyle in drm-tip

[Daniel Vetter]

On Wed, Oct 11, 2017 at 10:54:00AM +0200, Daniel Vetter wrote:
> 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.
> 
> Cc: Maxime Ripard <maxime.ripard at free-electrons.com>
> Cc: Noralf Trønnes <noralf at tronnes.org>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Pushed with an improved commit message and jani's ack.
-Daniel

> ---
>  dim | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/dim b/dim
> index af22f94ccdd5..006c3ca97075 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)... "
> -- 
> 2.14.1
> 

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