From: Junio C Hamano <junkio@cox.net>
Date: Sat, 24 Mar 2007 00:38:22 +0000 (-0700)
Subject: Merge branch 'master' into jc/bisect
X-Git-Tag: v1.5.2-rc0~94^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c2c6112a4bf655faa768ddfca067945edf2809e;p=git.git

Merge branch 'master' into jc/bisect

This is to merge in the fix for path-limited bisection
from the 'master' branch.
---

1c2c6112a4bf655faa768ddfca067945edf2809e
diff --cc builtin-rev-list.c
index b395ffeb0,51858e323..09e3a60bf
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@@ -182,12 -180,11 +182,12 @@@ static struct commit_list *find_bisecti
  			nr++;
  		p = p->next;
  	}
- 	*all = nr;
- 	closest = 0;
+ 	closest = -1;
  	best = list;
++	*all = nr;
  
  	for (p = list; p; p = p->next) {
 -		int distance;
 +		int distance, reach;
  
  		if (revs.prune_fn && !(p->item->object.flags & TREECHANGE))
  			continue;