diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2011-03-21 11:14:06 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-23 10:16:44 -0700 |
| commit | ad5aeeded3295589b2573b143f754762a56f8f82 (patch) | |
| tree | 264a93fc2b35d7e97ae4cd89b16d011cd4e149fa /builtin/rev-parse.c | |
| parent | t6009: use test_commit() from test-lib.sh (diff) | |
| download | tgif-ad5aeeded3295589b2573b143f754762a56f8f82.tar.xz | |
revision.c: introduce --min-parents and --max-parents options
Introduce --min-parents and --max-parents options which limit the
revisions to those commits which have at least (or at most) that many
commits, where negative arguments for --max-parents= denote infinity
(i.e. no upper limit).
In particular:
--max-parents=1 is the same as --no-merges;
--min-parents=2 is the same as --merges;
--max-parents=0 shows only roots; and
--min-parents=3 shows only octopus merges
Using --min-parents=n and --max-parents=m with n>m gives you what you ask
for (i.e. nothing) for obvious reasons, just like when you give --merges
(show only merge commits) and --no-merges (show only non-merge commits) at
the same time.
Also, introduce --no-min-parents and --no-max-parents to do the obvious
thing for convenience.
We compute the number of parents only when we limit by that, so there
is no performance impact when there are no limiters.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rev-parse.c')
| -rw-r--r-- | builtin/rev-parse.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index a5a1c86e92..adb1cae4f2 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -48,6 +48,10 @@ static int is_rev_argument(const char *arg) "--max-count=", "--min-age=", "--no-merges", + "--min-parents=", + "--no-min-parents", + "--max-parents=", + "--no-max-parents", "--objects", "--objects-edge", "--parents", |