fix a minor bug in ./all push

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 57d92453a1d1e89e0536081087b16d696a34bdef..e4316a0c8a2d84a92ba3ee6f5f196c0fa1cad81b 100755 (executable)
--- a/all
+++ b/all
@@ -153,7 +153,11 @@ case "$cmd" in
                                                fi
                                                ;;
                                esac
-                               verbose git config remote.origin.fetch "refs/heads/*:refs/remotes/origin/*"
+                               verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+                                       # TODO remove this line later
+
+                               git config core.autocrlf input
+                               git config core.safecrlf true
 
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
@@ -308,14 +312,15 @@ case "$cmd" in
                                        verbose git commit -a
                                fi
                        fi
-                       if git log "origin/$r".."$r" | grep .; then
+                       rem=`git config "branch.$r.remote" || echo origin`
+                       if git log "$rem/$r".."$r" | grep .; then
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
                                        echo "Push \"$r\" in $dv?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
-                                       verbose git push `git config "branch.$r.remote" || echo origin` HEAD
+                                       verbose git push "$rem" HEAD
                                fi
                        fi
                        cd "$d0"