projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac99ea1
)
fix admin-merge test compile
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:23:10 +0000
(10:23 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:23:10 +0000
(10:23 +0200)
all
patch
|
blob
|
history
diff --git
a/all
b/all
index 39b3b4052696f407cda0f286a46ed38278bfd740..365ef6864b210dc4c2ac570d6c482249ff1355fb 100755
(executable)
--- a/
all
+++ b/
all
@@
-833,7
+833,7
@@
case "$cmd" in
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
-n
2>&1 | tee "$t"; then
+ elif ! "$SELF" compile 2>&1 | tee "$t"; then
git reset --hard "$org"
GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
reportdo4 cat "$t"