From: Luben Tuikov <ltuikov@yahoo.com>
Date: Fri, 18 Nov 2005 21:29:04 +0000 (-0500)
Subject: max-count in terms of intersection
X-Git-Tag: v0.99.9k^2~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07f92477227e2a1770dfbb6318caedc4f091f6c1;p=git.git

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 <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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;