Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic

This commit is contained in:
Rudolf Polzer 2010-04-26 14:11:23 +02:00
commit 169208535f

18
all
View File

@ -243,13 +243,17 @@ case "$cmd" in
dv=`visible_repo_name "$d"`
enter "$d0/$d" verbose
a=
while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
echo "Branch in $dv?"
read -r a
done
if [ x"$a" = x"y" ]; then
verbose git push "$remote" "$srcbranch":"$branch"
verbose git checkout --track -b "$branch" "$remote/$branch"
if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
echo "Already having this branch in $dv."
else
while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
echo "Branch in $dv?"
read -r a
done
if [ x"$a" = x"y" ]; then
verbose git push "$remote" "$srcbranch":"$branch"
verbose git checkout --track -b "$branch" "$remote/$branch"
fi
fi
cd "$d0"
done