From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Sat, 10 Apr 2010 16:05:46 +0000 (+0200)
Subject: ./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)
X-Git-Tag: xonotic-v0.1.0preview~504
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f5bb6ca67804006b762fa17020fb040dac789a13;p=xonotic%2Fxonotic.git

./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)
---

diff --git a/all b/all
index c94d71b3..f36fdde2 100755
--- a/all
+++ b/all
@@ -153,10 +153,17 @@ case "$cmd" in
 						fi
 						;;
 				esac
-				if ! verbose git pull; then
-					check_mergeconflict "$d"
-					# do not exit, as this may also mean we are tracking something else
+				verbose git config remote.origin.fetch "refs/heads/*:refs/remotes/origin/*"
+
+				r=`git symbolic-ref HEAD`
+				r=${r#refs/heads/}
+				if git config branch.$r.remote >/dev/null 2>&1; then
+					if ! verbose git pull; then
+						check_mergeconflict "$d"
+						exit 1 # FATAL
+					fi
 				fi
+
 				cd "$d00"
 				checkself "$cmd" "$@"
 				cd "$d0/$d"