From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 15 Apr 2013 07:48:46 +0000 (+0200)
Subject: minor fix for mergefail logic
X-Git-Tag: xonotic-v0.7.0~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a363e3107b06cd370717973b20cfe586ef8800f;p=xonotic%2Fxonotic.git

minor fix for mergefail logic
---

diff --git a/misc/tools/all/git.subr b/misc/tools/all/git.subr
index 073c5dba..69ad888f 100644
--- a/misc/tools/all/git.subr
+++ b/misc/tools/all/git.subr
@@ -620,10 +620,11 @@ case "$cmd" in
 						o=`( cd "$d0" && git config xonotic.all.mirrorselection 2>/dev/null || true )`
 						( cd "$d0" && git config xonotic.all.mirrorselection try_same )
 						if ! verbose git pull; then
-							fix_upstream_rebase_mergefail || true
-							check_mergeconflict "$d"
-							$ECHO "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
-							read -r DUMMY
+							if fix_upstream_rebase_mergefail; then
+								check_mergeconflict "$d"
+								$ECHO "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+								read -r DUMMY
+							fi
 						else
 							( cd "$d0" && git config xonotic.all.mirrorselection "$o" )
 							fix_upstream_rebase_mergeok || true