fix a bug in the ./all script when checking out the DP repo

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 60bb471e380ad244f7dd65ffbad1ec31fa41a0b1..e49faeb823f2c6a24597c97f5bcdd2b3f2ade727 100755 (executable)
--- a/all
+++ b/all
@@ -213,10 +213,6 @@ case "$cmd" in
                                        enter "$d0/$d" verbose
                                        verbose git config remote.origin.url "$url"
                                        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-                                               # TODO remove this line later
-
-                                       verbose git config core.autocrlf false
-                                       verbose git config core.safecrlf false # we don't NEED that...
 
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
@@ -237,7 +233,9 @@ case "$cmd" in
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
-                               verbose git checkout "$branch"
+                               if [ "$branch" != "master" ]; then
+                                       verbose git checkout --track -b "$branch" origin/"$branch"
+                               fi
                                cd "$d0"
                        fi
                done
@@ -437,6 +435,9 @@ case "$cmd" in
        compile)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        TARGETS="sv-debug cl-debug"
+                       if [ -z "$CC" ]; then
+                               export CC=gcc
+                       fi
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi