X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=26a302776e26e28588f4762ca315e83030ff93f2;hp=35f09f9d2e3aa1aa8c73d727c2503a953511b3c9;hb=d76f3ba20d8487be18eea70e3c67669542fa41ac;hpb=238ea4253cb24b010aca1aee63fb33eed44c2efd

diff --git a/all b/all
index 35f09f9d..26a30277 100755
--- a/all
+++ b/all
@@ -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
+
 							echo "MERGING"
 							case ",`repoflags "$d"`," in
 								*,svn,*)