projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c11bb6
)
use compile -n to speed up admin-merge
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 12:01:59 +0000
(14:01 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 12:01:59 +0000
(14:01 +0200)
all
patch
|
blob
|
history
diff --git
a/all
b/all
index 4d834921f387b208ea28f9ba6aa3ef5e3e3e7362..eefa5cb5aecea97b748a1186e6e438f6e9331c71 100755
(executable)
--- a/
all
+++ b/
all
@@
-710,7
+710,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 2>&1 | tee "$t"; then
+ elif ! "$SELF" compile
-n
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"