From 59bbd42e0a6cfd17fcf570d2d4c6c78305ed52c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>
Date: Thu, 19 Apr 2018 16:05:03 -0500
Subject: ci-merge: Don't try to make manual merge if no DISPLAY
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If DISPLAY isn't set (user intervention), don't try
to make a conflict resolution and abort merge.

Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Amit Kucheria <amit.kucheria@linaro.org>
---
 ci-merge | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ci-merge b/ci-merge
index cc37b3b..369b57a 100755
--- a/ci-merge
+++ b/ci-merge
@@ -529,9 +529,14 @@ while read LINE; do
 
     git merge --no-ff --no-edit $REMOTE_NAME/$REMOTE_BRANCH
     if [ $? -ne 0 ]; then
-	echo "Merge failed, manual merge"
-	terminal -e "git mergetool -y"
-	git commit -a --no-edit
+        if [ -z $DISPLAY ]; then
+            echo "Merge failed, $REMOTE_NAME $REMOTE_URL $REMOTE_BRANCH"
+            git merge --abort
+        else
+            echo "Merge failed, manual merge"
+            terminal -e "git mergetool -y"
+            git commit -a --no-edit
+        fi
     fi
 
     MERGED=$((MERGED+1))
-- 
cgit v1.2.3