X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=cc1b15bffef477d9858780c5b3facea46cf8e108;hp=1b29784dc4e9e5d8f22276ddf534a92b5ac516e9;hb=bd5907159cd15e0db02a32951af3d6ad335f20e8;hpb=c9440d7f1b599893efa3958613dd6a39dd986812

diff --git a/all b/all
index 1b29784d..cc1b15bf 100755
--- a/all
+++ b/all
@@ -275,6 +275,7 @@ fix_upstream_rebase()
 	r_r=${r_r#refs/heads/}
 	r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
 	r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+	r_bra=${r_bra#refs/heads/}
 	if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
 		if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
 			return
@@ -1054,7 +1055,7 @@ case "$cmd" in
 
 		if [ x"$USE_GDB" = x"yes" ]; then
 			set -- gdb --args "$@"
-		elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
+		elif [ -z "$WE_HATE_OUR_USERS" ] && [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
 			set -- gdb --batch -x savecore.gdb --args "$@"
 		elif which catchsegv >/dev/null 2>&1; then
 			set -- catchsegv "$@"