Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rev-list: refuse --first-parent combined with --bisect
[gitweb.git]
/
revision.c
diff --git
a/revision.c
b/revision.c
index 2571ada6bf66ce6e945c539be4b0123e5b9648a9..161cf73b108748f15fee83878ff1953c31ef26cc 100644
(file)
--- 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;
}