From f88851c6376f0b2a4cf87c061a848e4ae4438e0a Mon Sep 17 00:00:00 2001 From: Kevin Daudt Date: Thu, 19 Mar 2015 23:14:08 +0100 Subject: rev-list: refuse --first-parent combined with --bisect rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together. Because this is not supported, it makes little sense to use git log --bisect --first parent either, because refs/heads/bad is not limited to the first parent chain. Helped-by: Junio C. Hamano Helped-by: Eric Sunshine Signed-off-by: Kevin Daudt Signed-off-by: Junio C Hamano --- t/t6000-rev-list-misc.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 't/t6000-rev-list-misc.sh') diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 3794e4ceaf..97a13a574e 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -73,4 +73,8 @@ test_expect_success 'symleft flag bit is propagated down from tag' ' 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 -- cgit v1.2.1