summaryrefslogtreecommitdiff
path: root/t/t6000-rev-list-misc.sh
diff options
context:
space:
mode:
authorAaron Lipman <alipman88@gmail.com>2020-08-07 21:58:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-08-07 22:11:59 (GMT)
commit0fe305a5d342225976688b1bd68dc4dc179b66b3 (patch)
treec695319b64bda483b850da86c55e7b9d717706e2 /t/t6000-rev-list-misc.sh
parent15a4802a69d0dd5e8a1b058d4a2cd5bec6c4bd6a (diff)
downloadgit-0fe305a5d342225976688b1bd68dc4dc179b66b3.zip
git-0fe305a5d342225976688b1bd68dc4dc179b66b3.tar.gz
git-0fe305a5d342225976688b1bd68dc4dc179b66b3.tar.bz2
rev-list: allow bisect and first-parent flags
Add first_parent_only parameter to find_bisection(), removing the barrier that prevented combining the --bisect and --first-parent flags when using git rev-list Based-on-patch-by: Tiago Botelho <tiagonbotelho@hotmail.com> Signed-off-by: Aaron Lipman <alipman88@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6000-rev-list-misc.sh')
-rwxr-xr-xt/t6000-rev-list-misc.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index 3dc1ad8..26e3533 100755
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -125,8 +125,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' '