autobuild: improve messages, detect exit status

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 648983b233f01a75c62dab0b03fb83883d02f855..933a51b6e78259583b56f9e06e2ca6ef1000d6e4 100755 (executable)
--- a/all
+++ b/all
@@ -709,7 +709,7 @@ case "$cmd" in
                                                        git push origin :"${ref#refs/remotes/origin/}"
                                                        reportecho4 "--> branch deleted"
                                                fi
-                                       elif [ -n "$note" ]; then
+                                       elif [ -z "$branch" ] && [ -n "$note" ]; then
                                                reportdo4 echo "$note"
                                                reportecho4 "--> not merging, already had this one rejected before"
                                        elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then