RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-19 03:56:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fix for mergefail logic

Browse Source
This commit is contained in:
Rudolf Polzer 2013-04-15 09:48:46 +02:00
parent e0fb99b953
commit 1a363e3107
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc/tools/all/git.subr
View File

@ -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