From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Mar 2009 06:36:57 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.2.1~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bf0fe35c938ac9f03d1369600b0c76e428a57507;p=git.git

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
---

bf0fe35c938ac9f03d1369600b0c76e428a57507
diff --cc git-bisect.sh
index 85db4ba40,b95dbbbbb..10ad34092
--- a/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*) ;;