From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 26 Apr 2010 09:10:20 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~482^2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=740a38b25a4637627123304d6355a355376a1979;p=xonotic%2Fxonotic.git

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

740a38b25a4637627123304d6355a355376a1979
diff --cc all
index 11bf13e2,e1979356..593736e7
--- a/all
+++ b/all
@@@ -224,19 -231,15 +231,19 @@@ case "$cmd" i
  		else
  			for d in $repos; do
  				dv=`visible_repo_name "$d"`
- 				enter "$d0/$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