make the algorithm a bit more customizable

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 03c5f9e36c6d4d1e974221e44a7291cc4bfc3df5..1296bdae9cecb62e4f6f4ae97d19a2e7a3e3236b 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