diff options
| author |  Aaron Lipman <alipman88@gmail.com> | 2020-08-07 17:58:35 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-07 15:11:59 -0700 |
| commit | 0fe305a5d342225976688b1bd68dc4dc179b66b3 (patch) | |
| tree | c695319b64bda483b850da86c55e7b9d717706e2 /revision.c | |
| parent | t6030: modernize "git bisect run" tests (diff) | |
| download | tgif-0fe305a5d342225976688b1bd68dc4dc179b66b3.tar.xz | |
rev-list: allow bisect and first-parent flags
Add first_parent_only parameter to find_bisection(), removing the
barrier that prevented combining the --bisect and --first-parent flags
when using git rev-list
Based-on-patch-by: Tiago Botelho <tiagonbotelho@hotmail.com>
Signed-off-by: Aaron Lipman <alipman88@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/revision.c b/revision.c index 6aa7f4f567..f0ad2603c1 100644 --- a/revision.c +++ b/revision.c @@ -2869,9 +2869,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (!revs->reflog_info && revs->grep_filter.use_reflog_filter) die("cannot use --grep-reflog without --walk-reflogs"); - if (revs->first_parent_only && revs->bisect) - die(_("--first-parent is incompatible with --bisect")); - if (revs->line_level_traverse && (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT))) die(_("-L does not yet support diff formats besides -p and -s")); |