fix admin-merge :P
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:13:54 +0000 (20:13 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:13:54 +0000 (20:13 +0200)
all

diff --git a/all b/all
index 739ff14..6e4a363 100755 (executable)
--- 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/}"