fix typo

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 57d92453a1d1e89e0536081087b16d696a34bdef..77bb5e2bdfd731b86c847150642429485cbd7d64 100755 (executable)
--- a/all
+++ b/all
@@ -1,4 +1,5 @@
 #!/bin/sh
+# vim: filetype=zsh
 
 set -e
 
@@ -153,7 +154,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
+
+                               verbose git config core.autocrlf input
+                               verbose git config core.safecrlf true
 
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
@@ -292,6 +297,7 @@ case "$cmd" in
                done
                ;;
        push|commit)
+               submit=$1
                for d in $repos; do
                        dv=`visible_repo_name "$d"`
                        enter "$d0/$d" verbose
@@ -308,16 +314,24 @@ 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
+                       if [ x"$submit" = x"-s" ]; then
+                               case "$r" in
+                                       */*)
+                                               verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
+                                               ;;
+                               esac
+                       fi
                        cd "$d0"
                done
                ;;
@@ -430,11 +444,46 @@ case "$cmd" in
                done
                rm -rf "$patchdir"
                ;;
+       admin-merge)
+               for d in $repos; do
+                       enter "$d0/$d" verbose
+                       git rev-parse "$1/$2" || continue
+                       # 1. review
+                       {
+                               git log HEAD.."$1/$2"
+                               git diff HEAD..."$1/$2"
+                       } | less
+                       a=
+                       while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                               echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
+                               read -r a
+                       done
+                       if [ x"$a" = x"y" ]; then
+                               git merge "$1/$2"
+                               cd "$d0"
+                               a=
+                               if ! "$SELF" compile; then
+                                       a=n
+                               fi
+                               cd "$d0/$d"
+                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                       echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
+                                       read -r a
+                               done
+                               if [ x"$a" = x"y" ]; then
+                                       git push origin HEAD
+                                       git push "$1" :"$2"
+                               else
+                                       git reset --hard HEAD@{1}
+                               fi
+                       fi
+               done
+               ;;
        *)
                echo "Usage:"
                echo "  $SELF pull"
                echo "  $SELF merge"
-               echo "  $SELF push"
+               echo "  $SELF push [-s]"
                echo "  $SELF branches"
                echo "  $SELF branch [<remote>] <branchname>"
                echo "  $SELF branch <remote> <branchname> <srcbranchname>"