[PATCH] max-count in terms of intersection

From: Luben Tuikov <ltuikov@yahoo.com>
Date: Nov 20, 2005, 15:53 UTC
Message-ID: <20051120155357.833.qmail@web31807.mail.mud.yahoo.com>

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>

---

 rev-list.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

applies-to: 5b820842ce0afb836ddbeded3a3f9e8d0ba223f9 768b79de9eadc38a839332df0fcce021f7174d6d

diff --git a/rev-list.c b/rev-list.c
index 6e6ffde..e17f928 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -124,8 +124,6 @@ static int filter_commit(struct 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 
                return CONTINUE;
        }
 
+       if (max_count != -1 && !max_count--)
+               return STOP;
+
        show_commit(commit);
 
        return CONTINUE;
---
0.99.9.GIT