Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

diff --combined all
index af5b22cb33cc411a57f7a72571da7867c834a6ce,4d82729188a989b3f83f0411e4655351e6332d4f..05324b5c78fa1d007ab733469c3d02b234de1daa
--- 1/all
--- 2/all
+++ b/all
@@@ -104,7 -104,7 +104,7 @@@ yesno(
  
  enter()
  {
 -      $2 cd "$1"
 +      $2 cd "$1" || exit 1
        check_mergeconflict "$1"
  }
  
@@@ -199,8 -199,6 +199,8 @@@ case "$cmd" i
                                        verbose git config remote.origin.url "$url"
                                        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
  
 +                                      verbose git config remote.origin.autocrlf input
 +
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
@@@ -321,7 -319,7 +321,7 @@@
        branches)
                for d in $repos; do
                        cd "$d0/$d" # am in a pipe, shouldn't use enter
-                       git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
+                       git branch -a -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ,"
                        cd "$d0"
                done | {
                        branches_list=
@@@ -459,22 -457,37 +459,37 @@@
                                cleanqc=true # version info
                                ;;
                esac
-               if [ -n "$1" ]; then
+               if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
+                       # if we give the command make the arg "", it will surely fail (invalid filename),
+                       # so better handle it as an empty client option
+                       BAD_TARGETS=" "
+                       shift
+               elif [ -n "$1" ]; then
+                       BAD_TARGETS=
+                       TARGETS_SAVE=$TARGETS
                        TARGETS=
                        for X in $1; do
                                case "$X" in
                                        sdl)
-                                               TARGETS="sdl-debug $TARGETS"
+                                               TARGETS="$TARGETS sdl-debug"
                                                ;;
                                        glx|agl|wgl)
-                                               TARGETS="cl-debug $TARGETS"
+                                               TARGETS="$TARGETS cl-debug"
                                                ;;
                                        dedicated)
-                                               TARGETS="sv-debug $TARGETS"
+                                               TARGETS="$TARGETS sv-debug"
+                                               ;;
+                                       *)
+                                               BAD_TARGETS="$BAD_TARGETS $X"
                                                ;;
                                esac
                        done
-                       shift
+                       if [ "$TARGETS" ]; then # at least a valid client
+                               shift
+                       else # no valid client, let's assume this option is not meant to be a client then
+                               TARGETS=$TARGETS_SAVE
+                               BAD_TARGETS=
+                       fi
                fi
                if [ -z "$MAKEFLAGS" ]; then
                        if [ -f /proc/cpuinfo ]; then
@@@ -506,12 -519,18 +521,18 @@@
                verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
  
                enter "$d0/darkplaces" verbose
+               if [ x"$BAD_TARGETS" = x" " ]; then
+                       echo "Warning: invalid empty client, default clients will be used."
+               fi
                if $cleandp; then
                        verbose make $MAKEFLAGS clean
                fi
                for T in $TARGETS; do
                        verbose make $MAKEFLAGS "$@" "$T"
                done
+               for T in $BAD_TARGETS; do
+                       echo "Warning: discarded invalid client $T."
+               done
  
                verbose "$SELF" update-maps
                ;;
@@@ -711,13 -730,13 +732,13 @@@
                                                        git push origin :"${ref#refs/remotes/origin/}"
                                                        reportecho4 "--> branch deleted"
                                                fi
 -                                      elif [ -n "$note" ]; then
 +                                      elif [ -z "$branch" ] && [ -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?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
                                                git checkout "$realbase"
                                                org=`git rev-parse HEAD`
 -                                              if ! git merge "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
 +                                              if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
                                                        git reset --hard "$org"
                                                        GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
                                                        reportdo4 cat "$t"