From 6b8ec4f290f319d5d26c6c99f2384de167d38457 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 2 Jul 2010 14:01:59 +0200 Subject: [PATCH] use compile -n to speed up admin-merge --- all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- 2.39.2