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 | |
| parent | 01c057df3fdf4b3fc50a49e61d0d9bd93517ff9b (diff) | |
| parent | f88851c6376f0b2a4cf87c061a848e4ae4438e0a (diff) | |
| download | git-257b204f2537e50c8c53326d188094203cd3515f.tar.gz | |
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
| -rw-r--r-- | Documentation/rev-list-options.txt | 7 | ||||
| -rw-r--r-- | revision.c | 3 | ||||
| -rwxr-xr-x | t/t6000-rev-list-misc.sh | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 4ed8587c84..e2de7891cb 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -123,7 +123,8 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits - brought in to your history by such a merge. + brought in to your history by such a merge. Cannot be + combined with --bisect. --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) @@ -185,7 +186,7 @@ ifndef::git-rev-list[] Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command - line. + line. Cannot be combined with --first-parent. endif::git-rev-list[] --stdin:: @@ -566,7 +567,7 @@ outputs 'midpoint', the output of the two commands would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length -one. +one. Cannot be combined with --first-parent. --bisect-vars:: This calculates the same as `--bisect`, except that refs in 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; } diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 2602086303..1f58b46e1f 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -96,4 +96,8 @@ test_expect_success 'rev-list can show index objects' ' test_cmp expect actual ' +test_expect_success '--bisect and --first-parent can not be combined' ' + test_must_fail git rev-list --bisect --first-parent HEAD +' + test_done |