X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=inline;f=all;h=9af8ea859741bffffc93119192d3051d374bdb93;hb=203dabbcb3354574527995954ce1f1e27b02825f;hp=f1eb1971a54b0f983c447f7db628ee17a8ae8714;hpb=5f0d658ff8f8a1dc3a85cf249e17f65ebf22176b;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index f1eb1971..9af8ea85 100755
--- a/all
+++ b/all
@@ -309,9 +309,11 @@ fix_git_config()
 	fi
 	verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 	verbose git config core.autocrlf input
-	if [ -z "`git config push.default`" ]; then
+	if [ -z "`git config push.default || true`" ]; then
 		verbose git config push.default current # or is tracking better?
 	fi
+	verbose git config filter.mapclean.clean "tr -d '\r' | grep '^[^/]'"
+	verbose git config filter.mapclean.smudge "cat"
 }
 
 mkzip()
@@ -1164,33 +1166,33 @@ case "$cmd" in
 		#   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
 		#   ./all clean --reclone
 		found=false
-		while :; do
-			if [ x"$1" = x"--reclone" ]; then
+		for X in "$@"; do
+			if [ x"$X" = x"--reclone" ]; then
 				force=true
 				fetchupstream=true
 				gotoupstream=true
 				gotomaster=true
 				rmuntracked=true
 				killbranches=true
-			elif [ x"$1" = x"-f" ]; then
+			elif [ x"$X" = x"-f" ]; then
 				force=true
-			elif [ x"$1" = x"-u" ]; then
+			elif [ x"$X" = x"-u" ]; then
 				gotoupstream=true
-			elif [ x"$1" = x"-U" ]; then
+			elif [ x"$X" = x"-U" ]; then
 				gotoupstream=true
 				fetchupstream=true
-			elif [ x"$1" = x"-fu" ]; then
+			elif [ x"$X" = x"-fu" ]; then
 				force=true
 				gotoupstream=true
-			elif [ x"$1" = x"-fU" ]; then
+			elif [ x"$X" = x"-fU" ]; then
 				force=true
 				gotoupstream=true
 				fetchupstream=true
-			elif [ x"$1" = x"-m" ]; then
+			elif [ x"$X" = x"-m" ]; then
 				gotomaster=true
-			elif [ x"$1" = x"-r" ]; then
+			elif [ x"$X" = x"-r" ]; then
 				rmuntracked=true
-			elif [ x"$1" = x"-D" ]; then
+			elif [ x"$X" = x"-D" ]; then
 				killbranches=true
 			else
 				break
@@ -1259,6 +1261,7 @@ case "$cmd" in
 				git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
 				git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
 			fi
+			checkself "$cmd" "$@"
 		done
 		;;
 
@@ -1483,10 +1486,11 @@ case "$cmd" in
 	release-qc)
 		case "$RELEASETYPE" in
 			beta)
-				verbose make -C Xonotic/source FTEQCC="../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+				# back out of: source/qcsrc/server
 				;;
 			release)
-				verbose make -C Xonotic/source FTEQCC="../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
+				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
 				;;
 		esac
 		verbose rm -f Xonotic/source/*/fteqcc.log