Merge remote branch 'origin/tzork/shadescript'

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 39b3b4052696f407cda0f286a46ed38278bfd740..5db184d226e4a472625ca04f04a2fb2df53ec780 100755 (executable)
--- a/all
+++ b/all
@@ -668,6 +668,8 @@ case "$cmd" in
 
                if [ -n "$USE_GDB" ]; then
                        set -- gdb --args "$@"
+               elif which catchsegv >/dev/null 2>&1; then
+                       set -- catchsegv "$@"
                fi
                "$@"
                ;;
@@ -833,7 +835,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"
@@ -950,6 +952,7 @@ case "$cmd" in
                                if $gotomaster; then
                                        if $fetchupstream; then
                                                verbose git fetch origin
+                                               verbose git remote prune origin
                                        fi
                                        verbose git checkout -f "`repobranch "$d"`"
                                        verbose git reset --hard origin/"`repobranch "$d"`"
@@ -961,6 +964,7 @@ case "$cmd" in
                                        upstream="$rem/${bra#refs/heads/}"
                                        if $fetchupstream; then
                                                verbose git fetch "$rem"
+                                               verbose git remote prune "$rem"
                                        fi
                                        if ! git rev-parse "$upstream" >/dev/null 2>&1; then
                                                upstream="origin/`repobranch "$d"`"