aboutsummaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 981f38872..d6845bc7f 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -88,15 +88,9 @@ static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
while (list) {
struct commit *commit = list->item;
unsigned int flags = commit->object.flags;
-
list = list->next;
- if (flags & UNINTERESTING)
- continue;
- if (rev->prune_fn && rev->dense && !(flags & TREECHANGE)) {
- if (commit->parents && !commit->parents->next)
- continue;
- }
- n++;
+ if ((flags & TREECHANGE) && !(flags & UNINTERESTING))
+ n++;
}
return n;
}