X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=eefa5cb5aecea97b748a1186e6e438f6e9331c71;hp=4d834921f387b208ea28f9ba6aa3ef5e3e3e7362;hb=6b8ec4f290f319d5d26c6c99f2384de167d38457;hpb=6c11bb65130b34e7c57fa8d4af3c42c966bb6afc diff --git a/all b/all index 4d834921..eefa5cb5 100755 --- 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"