diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-18 02:02:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-18 02:02:45 +0200 |
| commit | 47f0f94bc796037c43000a9852cdf9209a3c3274 (patch) | |
| tree | 7636f85361a0ced48efa126f27e1247596afb089 /revision.c | |
| parent | Merge branch 'jk/sideband-error-l10n' (diff) | |
| parent | bisect: combine args passed to find_bisection() (diff) | |
| download | git-47f0f94bc796037c43000a9852cdf9209a3c3274.tar.xz git-47f0f94bc796037c43000a9852cdf9209a3c3274.zip | |
Merge branch 'al/bisect-first-parent'
"git bisect" learns the "--first-parent" option to find the first
breakage along the first-parent chain.
* al/bisect-first-parent:
bisect: combine args passed to find_bisection()
bisect: introduce first-parent flag
cmd_bisect__helper: defer parsing no-checkout flag
rev-list: allow bisect and first-parent flags
t6030: modernize "git bisect run" tests
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 3dcf689341..dc86ec8732 100644 --- a/revision.c +++ b/revision.c @@ -2889,9 +2889,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")); |