diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2005-06-20 12:29:41 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:13:18 -0700 |
| commit | 5e749e259b39a74b31f6c768588b4e628e3802cb (patch) | |
| tree | 8e9e7a7562a372ab75f22e02fc35ee696f040314 /rev-list.c | |
| parent | 51b1e1713b1ed8e962e994cd0850ea439ad8c3de (diff) | |
| download | git-5e749e259b39a74b31f6c768588b4e628e3802cb.tar.gz | |
[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 <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'rev-list.c')
| -rw-r--r-- | rev-list.c | 13 |
1 files 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; |