Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  bisect: fix another instance of eval'ed string
  bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
  Support "\" in non-wildcard exclusion entries

Conflicts:
	git-bisect.sh

diff --cc dir.c
Simple merge

diff --cc git-bisect.sh
index 85db4ba40022e3a9e5790879d6d21fa59475b316,b95dbbbbb243069f5e673869b3867cfa4151aff7..10ad340920efb7177df53cb3a209d1a3edd5a039
--- 1/git-bisect.sh
--- 2/git-bisect.sh
+++ b/git-bisect.sh
@@@ -284,37 -263,44 +284,44 @@@ filter_skipped() 
        _skip="$2"
  
        if [ -z "$_skip" ]; then
-               eval "$_eval"
 -              eval_rev_list "$_eval" | {
++              eval "$_eval" | {
+                       while read line
+                       do
+                               echo "$line &&"
+                       done
+                       echo ':'
+               }
                return
        fi
  
        # Let's parse the output of:
        # "git rev-list --bisect-vars --bisect-all ..."
-       eval "$_eval" | while read hash line
-       do
-               case "$VARS,$FOUND,$TRIED,$hash" in
-                       # We display some vars.
-                       1,*,*,*) echo "$hash $line" ;;
- 
-                       # Split line.
-                       ,*,*,---*) ;;
- 
-                       # We had nothing to search.
 -      eval_rev_list "$_eval" | {
++      eval "$_eval" | {
+               VARS= FOUND= TRIED=
+               while read hash line
+               do
+                       case "$VARS,$FOUND,$TRIED,$hash" in
+                       1,*,*,*)
+                               # "bisect_foo=bar" read from rev-list output.
+                               echo "$hash &&"
+                               ;;
+                       ,*,*,---*)
+                               # Separator
+                               ;;
                        ,,,bisect_rev*)
-                               echo "bisect_rev="
+                               # We had nothing to search.
+                               echo "bisect_rev= &&"
                                VARS=1
                                ;;
- 
-                       # We did not find a good bisect rev.
-                       # This should happen only if the "bad"
-                       # commit is also a "skip" commit.
                        ,,*,bisect_rev*)
-                               echo "bisect_rev=$TRIED"
+                               # We did not find a good bisect rev.
+                               # This should happen only if the "bad"
+                               # commit is also a "skip" commit.
+                               echo "bisect_rev='$TRIED' &&"
                                VARS=1
                                ;;
- 
-                       # We are searching.
                        ,,*,*)
+                               # We are searching.
                                TRIED="${TRIED:+$TRIED|}$hash"
                                case "$_skip" in
                                *$hash*) ;;

diff --cc t/t3001-ls-files-others-exclude.sh
Simple merge

diff --cc t/t6030-bisect-porcelain.sh
Simple merge