diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:21 -0700 |
| commit | 257b204f2537e50c8c53326d188094203cd3515f (patch) | |
| tree | 196c07cbed8dcd79bad7c521c91ef9379ec57ca1 /revision.c | |
| parent | Merge branch 'ws/grep-quiet-no-pager' (diff) | |
| parent | rev-list: refuse --first-parent combined with --bisect (diff) | |
| download | tgif-257b204f2537e50c8c53326d188094203cd3515f.tar.xz | |
Merge branch 'kd/rev-list-bisect-first-parent'
"git rev-list --bisect --first-parent" does not work (yet) and can
even cause SEGV; forbid it. "git log --bisect --first-parent"
would not be useful until "git bisect --first-parent" materializes,
so it is also forbidden for now.
* kd/rev-list-bisect-first-parent:
rev-list: refuse --first-parent combined with --bisect
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 66520c671e..ed3f6e967b 100644 --- a/revision.c +++ b/revision.c @@ -2342,6 +2342,9 @@ 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")); + return left; } |