"branch" command: always branch off master, not off HEAD, unless a branch is specified

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 21c9eaa54f9ad18285933805c805a269307e7956..c94d71b36be26690535cbbf9a8626a25694da14b 100755 (executable)
--- a/all
+++ b/all
@@ -70,6 +70,18 @@ verbose()
        "$@"
 }
 
+visible_repo_name()
+{
+       case "$1" in
+               .)
+                       echo "the root directory"
+                       ;;
+               *)
+                       echo "\"$1\""
+                       ;;
+       esac
+}
+
 check_mergeconflict()
 {
        if git ls-files -u | grep ' 1   '; then
@@ -146,7 +158,7 @@ case "$cmd" in
                                        # do not exit, as this may also mean we are tracking something else
                                fi
                                cd "$d00"
-                               checkself "$SELF" "$@"
+                               checkself "$cmd" "$@"
                                cd "$d0/$d"
                                verbose git remote prune origin
                                cd "$d0"
@@ -175,7 +187,7 @@ case "$cmd" in
                                verbose git checkout master
                        fi
                        cd "$d00"
-                       checkself "$SELF" "$@"
+                       checkself "$cmd" "$@"
                        cd "$d0"
                done
                if ! $exists; then
@@ -186,10 +198,14 @@ case "$cmd" in
        branch)
                remote=$1
                branch=$2
+               srcbranch=$3
                if [ -z "$branch" ]; then
                        branch=$remote
                        remote=origin
                fi
+               if [ -z "$srcbranch" ]; then
+                       srcbranch=master
+               fi
                if [ -z "$branch" ]; then
                        for d in $repos; do
                                enter "$d0/$d"
@@ -200,14 +216,15 @@ case "$cmd" in
                        done
                else
                        for d in $repos; do
+                               dv=`visible_repo_name "$d"`
                                enter "$d0/$d"
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Branch in \"$d\"?"
+                                       echo "Branch in $dv?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
-                                       verbose git push "$remote" HEAD:"$branch"
+                                       verbose git push "$remote" "$srcbranch":"$branch"
                                        verbose git checkout --track -b "$branch" "$remote/$branch"
                                fi
                                cd "$d0"
@@ -225,6 +242,7 @@ case "$cmd" in
                ;;
        merge)
                for d in $repos; do
+                       dv=`visible_repo_name "$d"`
                        enter "$d0/$d"
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
@@ -232,7 +250,7 @@ case "$cmd" in
                                # we have uncommitted changes
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Could merge from \"master\" into \"$r\" in \"$d\". Do it?"
+                                       echo "Could merge from \"master\" into \"$r\" in $dv. Do it?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -247,6 +265,7 @@ case "$cmd" in
                ;;
        push)
                for d in $repos; do
+                       dv=`visible_repo_name "$d"`
                        enter "$d0/$d"
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
@@ -254,7 +273,7 @@ case "$cmd" in
                                # we have uncommitted changes
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+                                       echo "Uncommitted changes in \"$r\" in $dv. Commit?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -264,7 +283,7 @@ case "$cmd" in
                        if git log "origin/$r".."$r" | grep .; then
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Push \"$r\" in \"$d\"?"
+                                       echo "Push \"$r\" in $dv?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -329,6 +348,7 @@ case "$cmd" in
                echo "  $SELF push"
                echo "  $SELF branches"
                echo "  $SELF branch [<remote>] <branchname>"
+               echo "  $SELF branch <remote> <branchname> <srcbranchname>"
                echo "  $SELF checkout [<remote>] <branchname>"
                echo "  $SELF compile"
                echo "  $SELF run <client> <options>"