From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Jul 2010 18:13:54 +0000 (+0200)
Subject: fix admin-merge :P
X-Git-Tag: xonotic-v0.1.0preview~342
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=5df4279b76015f1e07d10b1fd69ee2efcb1406bb

fix admin-merge :P
---

diff --git a/all b/all
index 739ff146..6e4a3638 100755
--- a/all
+++ b/all
@@ -750,7 +750,7 @@ case "$cmd" in
 							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 edit "$ref"
+							GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
 							note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
 							if [ x"$note" = x"del" ]; then
 								git push origin :"${ref#refs/remotes/origin/}"