From 1a363e3107b06cd370717973b20cfe586ef8800f Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 15 Apr 2013 09:48:46 +0200 Subject: [PATCH] minor fix for mergefail logic --- misc/tools/all/git.subr | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 -- 2.39.2