X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=5db184d226e4a472625ca04f04a2fb2df53ec780;hp=365ef6864b210dc4c2ac570d6c482249ff1355fb;hb=84c897e857cb94ab75672ba9e295ca0ff47cc713;hpb=13b1970d4835e3d431b868575b988109ac78ca48 diff --git a/all b/all index 365ef686..5db184d2 100755 --- 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 "$@" ;; @@ -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"`"