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

diff --git a/all b/all
index 3e372b85..ecf385bb 100755
--- a/all
+++ b/all
@@ -120,7 +120,7 @@ div0-gittools                 |
 d0_blind_id                   |                                                   | master         |
 data/xonotic-maps.pk3dir      |                                                   | master         |
 mediasource                   |                                                   | master         | no
-fteqcc                        |                                                   | xonotic-stable |
+fteqcc                        |                                                   | xonotic-stable | noautocrlf
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -308,7 +308,14 @@ fix_git_config()
 		verbose git config --unset remote.origin.pushurl || true
 	fi
 	verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-	verbose git config core.autocrlf input
+	case ",`repoflags "$d"`," in
+		*,noautocrlf,*)
+			verbose git config --unset core.autocrlf || true
+			;;
+		*)
+			verbose git config core.autocrlf input
+			;;
+	esac
 	if [ -z "`git config push.default || true`" ]; then
 		verbose git config push.default current # or is tracking better?
 	fi
@@ -1039,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:"
@@ -1122,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,*)
@@ -1203,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