summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorKevin Daudt <me@ikke.info>2015-03-19 23:14:08 +0100
committerJunio C Hamano <gitster@pobox.com>2015-03-19 15:26:21 -0700
commitf88851c6376f0b2a4cf87c061a848e4ae4438e0a (patch)
treeea29f8f8bdc58aeeb3621673b309ee36f5204d90 /revision.c
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-f88851c6376f0b2a4cf87c061a848e4ae4438e0a.tar.gz
rev-list: refuse --first-parent combined with --bisectkd/rev-list-bisect-first-parent
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 <gitster@pobox.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Kevin Daudt <me@ikke.info> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 2571ada6bf..161cf73b10 100644
--- a/revision.c
+++ b/revision.c
@@ -2273,6 +2273,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;
}