Ubuntu 16.04 LTS has this version of git, and it's known to handle
(some, but not all) stored conflict resolutions differently than newer
versions of git.
Since it's a common snag detect it and suggest to upgrade.
Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
---
dim | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dim b/dim
index 9fa6d9cd855b..53967edc3d1f 100755
--- a/dim
+++ b/dim
@@ -496,6 +496,10 @@ function check_conflicts # tree
echoerr "FAILURE: Could not merge $1"
echoerr "See the section \"Resolving Conflicts when Rebuilding
drm-tip\""
echoerr "in the drm-intel.rst documentation for how to handle
this situation."
+
+ if git --version | grep -q "git version 2.7" ; then
+ echoerr "git version 2.7 is known to misapply stored
conflict resolutions, please upgrade"
+ fi
exit 1
fi
true
--
2.16.2
_______________________________________________
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
