X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=a36db2684662e2aa2d982a6e62934a82f99a5bc1;hp=365ef6864b210dc4c2ac570d6c482249ff1355fb;hb=509d1a597b01b48ce666d8c84d538c4c2e40eedf;hpb=13b1970d4835e3d431b868575b988109ac78ca48 diff --git a/all b/all index 365ef686..a36db268 100755 --- a/all +++ b/all @@ -118,7 +118,7 @@ netradiant | div0-gittools | | master | no data/xonotic-maps.pk3dir | | master | mediasource | | master | no -fteqcc | git://github.com/Blub/qclib.git | master | +fteqcc | http://github.com/Blub/qclib.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -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"`"