fix useless warning on pulseaudio check on Windows :P

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 93578fc8bb32a1d1effe41d7b89c746da7100752..935a58ae0c8327034a5b39b25b736688c4f65913 100755 (executable)
--- a/all
+++ b/all
@@ -252,12 +252,17 @@ case "$cmd" in
                exists=false
                for d in $repos; do
                        enter "$d0/$d" verbose
-                       if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+                       if [ -z "$branch" ]; then
+                               b=`repobranch "$d"`
+                       else
+                               b=$branch
+                       fi
+                       if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
                                exists=true
-                               verbose git checkout "$branch"
-                       elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
+                               verbose git checkout "$b"
+                       elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
                                exists=true
-                               verbose git checkout --track -b "$branch" "$remote/$branch"
+                               verbose git checkout --track -b "$b" "$remote/$b"
                        else
                                verbose git checkout "`repobranch "$d"`"
                        fi
@@ -517,9 +522,11 @@ case "$cmd" in
                set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 
                # if pulseaudio is running: USE IT
-               if ps -C pulseaudio >/dev/null; then
-                       if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
-                               export SDL_AUDIODRIVER=pulse
+               if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; then
+                       if ps -C pulseaudio >/dev/null; then
+                               if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+                                       export SDL_AUDIODRIVER=pulse
+                               fi
                        fi
                fi
 
@@ -655,7 +662,7 @@ case "$cmd" in
                                if [ -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?" '{ git log HEAD.."$ref"; git diff HEAD..."$ref"; } | less'; then
+                               elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color HEAD.."$ref"; git diff --color --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
                                        git checkout master
                                        org=`git rev-parse HEAD`
                                        if ! git merge "$ref" 2>&1 | tee "$t"; then