./all admin-merge-2: show proper merge preview in the DP repo

[xonotic/xonotic.git] / all

diff --git a/all b/all
index bdb93f26f2bc7025cc16a02acbc47cf49979e561..1e8c690205c115d677778221cf3e3decd9796895 100755 (executable)
--- a/all
+++ b/all
@@ -302,11 +302,14 @@ case "$cmd" in
                                                if [ -n "$srcbranch" ]; then
                                                        b=$srcbranch
                                                else
-                                                       b="`repobranch "$d"`"
+                                                       b=origin/"`repobranch "$d"`"
+                                                       verbose git fetch origin || true
                                                fi
                                                # TODO do this without pushing
-                                               verbose git push "$remote" "$b":"$branch"
-                                               verbose git checkout --track -b "$branch" "$remote/$branch"
+                                               verbose git checkout -b "$branch" "$b"
+                                               verbose git config "branch.$branch.remote" "$remote"
+                                               verbose git config "branch.$branch.merge" "refs/heads/$b"
+                                               verbose git push origin "$branch"
                                        fi
                                fi
                                cd "$d0"
@@ -522,9 +525,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
 
@@ -660,7 +665,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 master.."$ref"; git diff --color --find-copies-harder --ignore-space-change master..."$ref"; } | less -r'; then
                                        git checkout master
                                        org=`git rev-parse HEAD`
                                        if ! git merge "$ref" 2>&1 | tee "$t"; then