don't run admin-merge on the fteqcc repo

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 35f09f9d2e3aa1aa8c73d727c2503a953511b3c9..26a302776e26e28588f4762ca315e83030ff93f2 100755 (executable)
--- 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,*)