diff options
Diffstat (limited to 'rev-list.c')
| -rw-r--r-- | rev-list.c | 10 |
1 files changed, 3 insertions, 7 deletions
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; |