mirror of
https://gitlab.com/xonotic/xonotic
synced 2025-01-18 20:21:18 +00:00
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
This commit is contained in:
commit
169208535f
18
all
18
all
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user