X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=365ef6864b210dc4c2ac570d6c482249ff1355fb;hp=39b3b4052696f407cda0f286a46ed38278bfd740;hb=13b1970d4835e3d431b868575b988109ac78ca48;hpb=ac99ea1e2fadd6d19b2a2a52fea9890ca3dba02b diff --git a/all b/all index 39b3b405..365ef686 100755 --- 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"