]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'master' into jc/bisect
authorJunio C Hamano <junkio@cox.net>
Sat, 24 Mar 2007 00:38:22 +0000 (17:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Mar 2007 06:38:04 +0000 (23:38 -0700)
This is to merge in the fix for path-limited bisection
from the 'master' branch.

1  2 
builtin-rev-list.c

index b395ffeb03340af98f7f2c6447c850f7529d1cfb,51858e3233a74a2a5cc7e96e7dc5d9786fecc326..09e3a60bf6492a280baf4e09eaa29ede67c7c245
@@@ -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;