RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-01-18 20:21:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rudolf Polzer 2010-04-05 13:48:23 +02:00
parent 3db1a93510
commit 2e2d41c6ba
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
all
View File

@ -198,10 +198,14 @@ case "$cmd" in
branch) branch)
remote=$1 remote=$1
branch=$2 branch=$2
srcbranch=$3
if [ -z "$branch" ]; then if [ -z "$branch" ]; then
branch=$remote branch=$remote
remote=origin remote=origin
fi fi
if [ -z "$srcbranch" ]; then
srcbranch=master
fi
if [ -z "$branch" ]; then if [ -z "$branch" ]; then
for d in $repos; do for d in $repos; do
enter "$d0/$d" enter "$d0/$d"
@ -220,7 +224,7 @@ case "$cmd" in
read -r a read -r a
done done
if [ x"$a" = x"y" ]; then 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" verbose git checkout --track -b "$branch" "$remote/$branch"
fi fi
cd "$d0" cd "$d0"
@ -344,6 +348,7 @@ case "$cmd" in
echo " $SELF push" echo " $SELF push"
echo " $SELF branches" echo " $SELF branches"
echo " $SELF branch [<remote>] <branchname>" echo " $SELF branch [<remote>] <branchname>"
echo " $SELF branch <remote> <branchname> <srcbranchname>"
echo " $SELF checkout [<remote>] <branchname>" echo " $SELF checkout [<remote>] <branchname>"
echo " $SELF compile" echo " $SELF compile"
echo " $SELF run <client> <options>" echo " $SELF run <client> <options>"