X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=ecf385bbf28056cd7ae7303e8c3582852d5126fd;hp=e5674a9e21e5894b3c5b792388124a6c7c0d35c2;hb=6a089e000cbe2997c470c03dbbdfe295669f5323;hpb=ae86caef928f46a4b3f70a2901cfc6a61fcfaeb0

diff --git a/all b/all
index e5674a9e..ecf385bb 100755
--- a/all
+++ b/all
@@ -310,7 +310,7 @@ fix_git_config()
 	verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 	case ",`repoflags "$d"`," in
 		*,noautocrlf,*)
-			verbose git config --unset core.autocrlf
+			verbose git config --unset core.autocrlf || true
 			;;
 		*)
 			verbose git config core.autocrlf input
@@ -1046,6 +1046,12 @@ case "$cmd" in
 			reportecho "$o"
 		}
 		for d in $repos; do
+			case "$d" in
+				fteqcc)
+					# sorry, fteqcc repo is managed manually
+					continue
+					;;
+			esac
 			enter "$d0/$d" verbose
 			base="`repobranch "$d"`"
 			reportecho "In $d:"
@@ -1129,6 +1135,11 @@ case "$cmd" in
 								reportecho4 "--> test failed, postponed"
 							fi
 						else
+							# apply crlf, or other cleanup filters (non-behavioural changes)
+							git reset --hard
+							find . -type f -exec touch {} \;
+							git commit -a --amend -C HEAD || true # don't fail if nothing to commit
+
 							echo "MERGING"
 							case ",`repoflags "$d"`," in
 								*,svn,*)
@@ -1210,6 +1221,17 @@ case "$cmd" in
 				rmuntracked=true
 			elif [ x"$X" = x"-D" ]; then
 				killbranches=true
+			elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+				msg '        _____'
+				msg '    ,--'\''-\P/`\  FFFFFFF'
+				msg ' __/_    B/,-.\  FFFFFFF'
+				msg ' /  _\  (//  O\\  FFFFFF'
+				msg '| (O  `) _\._ _)\  FFFUU'
+				msg '| |___/.^d0~~"\  \ UUUU'
+				msg '|     |`~'\''     \ |  UUUU'
+				msg '|     |    __,C>|| UUUU'
+				msg '\    /_ ,-/,-'\''   |  UUUU'
+				msg ' \\_ \_>~'\''      /  UUUU-'
 			else
 				break
 			fi