From 07f92477227e2a1770dfbb6318caedc4f091f6c1 Mon Sep 17 00:00:00 2001 From: Luben Tuikov Date: Fri, 18 Nov 2005 16:29:04 -0500 Subject: [PATCH] max-count in terms of intersection When a path designation is given, max-count counts the number of commits therein (intersection), not globally. This avoids the case where in case path has been inactive for the last N commits, --max-count=N and path designation at git-rev-list is given, would give no commits. Signed-off-by: Luben Tuikov Signed-off-by: Junio C Hamano --- rev-list.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rev-list.c b/rev-list.c index 6e6ffde39..e17f92806 100644 --- a/rev-list.c +++ b/rev-list.c @@ -124,8 +124,6 @@ static int filter_commit(struct commit * commit) stop_traversal=1; return CONTINUE; } - if (max_count != -1 && !max_count--) - return STOP; if (no_merges && (commit->parents && commit->parents->next)) return CONTINUE; if (paths && dense) { @@ -148,6 +146,9 @@ static int process_commit(struct commit * commit) return CONTINUE; } + if (max_count != -1 && !max_count--) + return STOP; + show_commit(commit); return CONTINUE; -- 2.30.2