fix a minor typo

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 03c5f9e36c6d4d1e974221e44a7291cc4bfc3df5..49e029635216c38e6af86eba4706f013c56102c9 100755 (executable)
--- a/all
+++ b/all
@@ -205,6 +205,9 @@ listrepos()
                                continue
                                ;;
                esac
+               # default: enable
+               msg "Repository $d enabled by default"
+               echo "$d"
        done
 }
 
@@ -261,6 +264,14 @@ fix_upstream_rebase_mergefail()
        fix_upstream_rebase
 }
 
+fix_git_config()
+{
+       verbose git config core.autocrlf input
+       if [ -z "`git config push.default`" ]; then
+               verbose git config push.default current # or is tracking better?
+       fi
+}
+
 case "$cmd" in
        fix_upstream_rebase)
                for d in $repos; do
@@ -279,11 +290,9 @@ case "$cmd" in
                        if [ -d "$d0/$d" ]; then
                                if $allow_pull; then
                                        enter "$d0/$d" verbose
+                                       fix_git_config
                                        verbose git config remote.origin.url "$url"
                                        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-
-                                       verbose git config core.autocrlf input
-
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
@@ -306,6 +315,7 @@ case "$cmd" in
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
+                               fix_git_config
                                if [ "$branch" != "master" ]; then
                                        verbose git checkout --track -b "$branch" origin/"$branch"
                                fi
@@ -894,9 +904,10 @@ case "$cmd" in
                        force=true
                fi
                for d in $repos; do
-                       enter "$d0/$d" verbose
+                       verbose cd "$d0/$d"
                        if $force; then
-                               verbose git checkout-index -fa
+                               verbose git reset --hard
+                               #redundant# verbose git checkout-index -fa
                        fi
                        case "$d" in
                                .)
@@ -1024,7 +1035,7 @@ case "$cmd" in
                verbose "$SELF" release-compile osx \
                        'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
                        '' '' \
-                       'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+                       'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
                ;;
        release-engine-osx)
                verbose "$SELF" release-engine-osx-sv-sdl