From: Jon Seymour <jon.seymour@gmail.com>
Date: Wed, 6 Jul 2005 16:39:34 +0000 (+1000)
Subject: [PATCH] Tidy up - slight simplification of rev-list.c
X-Git-Tag: v0.99~47
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d2775a817a19d966ec35a1da9440e2feb55276f4;p=git.git

[PATCH] Tidy up - slight simplification of rev-list.c

This patch implements a small tidy up of rev-list.c to reduce
(but not eliminate) the amount of ugliness associated
with the merge_order flag.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/rev-list.c b/rev-list.c
index f41adebd8..c4a615134 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -71,19 +71,15 @@ static void show_commit(struct commit *commit)
 
 static int filter_commit(struct commit * commit)
 {
-	if (merge_order && stop_traversal && commit->object.flags & BOUNDARY)
+	if (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)) {
-		if (!merge_order)
-			return STOP;
-		else {
-			stop_traversal = 1;
-			return CONTINUE;
-		}
+		stop_traversal=1;
+		return merge_order?CONTINUE:STOP;
 	}
 	if (max_count != -1 && !max_count--)
 		return STOP;