diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-25 22:54:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 22:54:21 +0300 |
| commit | 257b204f2537e50c8c53326d188094203cd3515f (patch) | |
| tree | 196c07cbed8dcd79bad7c521c91ef9379ec57ca1 /t/t6000-rev-list-misc.sh | |
| parent | 01c057df3fdf4b3fc50a49e61d0d9bd93517ff9b (diff) | |
| parent | f88851c6376f0b2a4cf87c061a848e4ae4438e0a (diff) | |
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 't/t6000-rev-list-misc.sh')
| -rwxr-xr-x | t/t6000-rev-list-misc.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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 |