projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f665e3c
)
fix admin-merge :P
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:13:54 +0000
(20:13 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:13:54 +0000
(20:13 +0200)
all
patch
|
blob
|
history
diff --git
a/all
b/all
index 739ff1466e8f20fd3fe736b5bd1388bfe39c8bca..6e4a3638a215945ddca892e7a2733b62538778a0 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/}"