[PATCH 2/2] Fix --topo-order, --max-age interaction issue
From: Jon Seymour <hidden>
Date: 2016-06-15 22:42:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
Applied the --merge-order, --max-age fix to fix the --topo-order problem demonstrated by the test case in the previous patch. Signed-off-by: Jon Seymour <redacted> --- rev-list.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 8238686fd422959dae50a908b3761aa545be1c4f
diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c@@ -75,7 +75,7 @@ static int filter_commit(struct commit * return CONTINUE; if (max_age != -1 && (commit->date < max_age)) { stop_traversal=1; - return merge_order?CONTINUE:STOP; + return (merge_order||topo_order)?CONTINUE:STOP; } if (max_count != -1 && !max_count--) return STOP; ------------