projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/gitk/gitk
[git.git]
/
rev-list.c
diff --git
a/rev-list.c
b/rev-list.c
index
8e4d83e
..
812d237
100644
(file)
--- a/
rev-list.c
+++ b/
rev-list.c
@@
-190,7
+190,7
@@
static int count_distance(struct commit_list *entry)
if (commit->object.flags & (UNINTERESTING | COUNTED))
break;
if (commit->object.flags & (UNINTERESTING | COUNTED))
break;
- if (!revs.p
aths
|| (commit->object.flags & TREECHANGE))
+ if (!revs.p
rune_fn
|| (commit->object.flags & TREECHANGE))
nr++;
commit->object.flags |= COUNTED;
p = commit->parents;
nr++;
commit->object.flags |= COUNTED;
p = commit->parents;
@@
-224,7
+224,7
@@
static struct commit_list *find_bisection(struct commit_list *list)
nr = 0;
p = list;
while (p) {
nr = 0;
p = list;
while (p) {
- if (!revs.p
aths
|| (p->item->object.flags & TREECHANGE))
+ if (!revs.p
rune_fn
|| (p->item->object.flags & TREECHANGE))
nr++;
p = p->next;
}
nr++;
p = p->next;
}
@@
-234,7
+234,7
@@
static struct commit_list *find_bisection(struct commit_list *list)
for (p = list; p; p = p->next) {
int distance;
for (p = list; p; p = p->next) {
int distance;
- if (revs.p
aths
&& !(p->item->object.flags & TREECHANGE))
+ if (revs.p
rune_fn
&& !(p->item->object.flags & TREECHANGE))
continue;
distance = count_distance(p);
continue;
distance = count_distance(p);