diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-18 00:02:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-18 00:02:45 (GMT) |
| commit | 47f0f94bc796037c43000a9852cdf9209a3c3274 (patch) | |
| tree | 7636f85361a0ced48efa126f27e1247596afb089 /t/t6000-rev-list-misc.sh | |
| parent | 789279e7f8439ea0e0727f6de36b2edafcbc5f3c (diff) | |
| parent | ad464a4e84b502fdfd4671f1c443060c7e87113f (diff) | |
| download | git-47f0f94bc796037c43000a9852cdf9209a3c3274.zip git-47f0f94bc796037c43000a9852cdf9209a3c3274.tar.gz git-47f0f94bc796037c43000a9852cdf9209a3c3274.tar.bz2 | |
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 't/t6000-rev-list-misc.sh')
| -rwxr-xr-x | t/t6000-rev-list-misc.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 3bb0e4f..fc4d55d 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -128,8 +128,8 @@ test_expect_success 'rev-list can negate 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_expect_success '--bisect and --first-parent can be combined' ' + git rev-list --bisect --first-parent HEAD ' test_expect_success '--header shows a NUL after each commit' ' |