From 5e749e259b39a74b31f6c768588b4e628e3802cb Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Mon, 20 Jun 2005 12:29:41 +1000 Subject: [PATCH] [PATCH] Fix for --merge-order, --max-age interaction issue This patch fixes a problem reported by Paul Mackerras regarding the interaction of the --merge-order and --max-age switches of git-rev-list. This patch applies to the current Linus HEAD. A cleaner fix for the same problem in my current HEAD will follow later. With this change, --merge-order produces the same result as no --merge-order on the linux-2.6 git repository, to wit: $> git-rev-list --max-age=1116330140 bcfff0b471a60df350338bcd727fc9b8a6aa54b2 | wc -l 655 $> git-rev-list --merge-order --max-age=1116330140 bcfff0b471a60df350338bcd727fc9b8a6aa54b2 | wc -l 655 Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds --- rev-list.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rev-list.c b/rev-list.c index 897a0e7ad8..16920ef69e 100644 --- a/rev-list.c +++ b/rev-list.c @@ -27,6 +27,7 @@ static int max_count = -1; static enum cmit_fmt commit_format = CMIT_FMT_RAW; static int merge_order = 0; static int show_breaks = 0; +static int stop_traversal = 0; static void show_commit(struct commit *commit) { @@ -57,12 +58,20 @@ static void show_commit(struct commit *commit) static int filter_commit(struct commit * commit) { + if (merge_order && stop_traversal && commit->object.flags & BOUNDARY) + return STOP; if (commit->object.flags & (UNINTERESTING|SHOWN)) return CONTINUE; if (min_age != -1 && (commit->date > min_age)) return CONTINUE; - if (max_age != -1 && (commit->date < max_age)) - return STOP; + if (max_age != -1 && (commit->date < max_age)) { + if (!merge_order) + return STOP; + else { + stop_traversal = 1; + return CONTINUE; + } + } if (max_count != -1 && !max_count--) return STOP; return DO; -- 2.11.4.GIT