From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 17 Jun 2010 07:20:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~422^2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=7e147c7e326b0d218600e590f6289f18bbe93f19;hp=-c

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

7e147c7e326b0d218600e590f6289f18bbe93f19
diff --combined all
index 8b2caa05,964233c0..b88931b4
--- a/all
+++ b/all
@@@ -250,25 -250,19 +250,25 @@@ case "$cmd" i
  		exists=false
  		for d in $repos; do
  			enter "$d0/$d" verbose
 -			if [ -z "$branch" ]; then
 -				b=`repobranch "$d"`
 -			else
 -				b=$branch
 -			fi
 -			if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
 +			b=$branch
 +			if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
  				exists=true
  				verbose git checkout "$b"
 -			elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
 +			elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
  				exists=true
  				verbose git checkout --track -b "$b" "$remote/$b"
  			else
 -				verbose git checkout "`repobranch "$d"`"
 +				b=`repobranch "$d"`
 +				if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
 +					exists=true
 +					verbose git checkout "$b"
 +				elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
 +					exists=true
 +					verbose git checkout --track -b "$b" "$remote/$b"
 +				else
 +					echo "WTF? Not even branch $b doesn't exist in $d"
 +					exit 1
 +				fi
  			fi
  			cd "$d00"
  			checkself "$cmd" "$@"
@@@ -676,7 -670,7 +676,7 @@@
  						;;
  				esac
  				reportecho "  Branch $ref:"
- 				note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+ 				note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
  				if [ -n "$note" ]; then
  					reportdo4 echo "$note"
  					reportecho4 "--> not merging, already had this one rejected before"
@@@ -685,18 -679,18 +685,18 @@@
  					org=`git rev-parse HEAD`
  					if ! git merge "$ref" 2>&1 | tee "$t"; then
  						git reset --hard "$org"
- 						git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref"
+ 						GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
  						reportdo4 cat "$t"
  						reportecho4 "--> merge failed"
  					elif ! "$SELF" compile 2>&1 | tee "$t"; then
  						git reset --hard "$org"
- 						git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref"
+ 						GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
  						reportdo4 cat "$t"
  						reportecho4 "--> compile failed"
  					elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
  						git reset --hard "$org"
- 						git notes --ref "refs/notes/admin-merge" add "$ref"
- 						note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+ 						git notes edit "$ref"
+ 						note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
  						reportdo4 echo "$note"
  						reportecho4 "--> test failed"
  					else
@@@ -720,7 -714,7 +720,7 @@@
  					fi
  				else
  					git notes --ref "refs/notes/admin-merge" add "$ref"
- 					note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+ 					note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
  					if [ -n "$note" ]; then
  						reportdo4 echo "$note"
  						reportecho4 "--> rejected"