Re: [PATCH] rev-list: refuse --first-parent combined with --bisect
From: Kevin Daudt <hidden>
Date: 2016-06-15 23:04:04
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] rev-list: refuse --first-parent combined with --bisect · Junio C Hamano <hidden>
On Sat, Mar 07, 2015 at 10:31:16PM +0100, Kevin Daudt wrote:
quoted hunk ↗ jump to hunk
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ff84a82..c271e15 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c@@ -291,6 +291,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (revs.bisect) bisect_list = 1; + if(revs.first_parent_only && revs.bisect)
I should have added a space after the if.
+ die(_("--first-parent is incompattible with --bisect"));
+
if (DIFF_OPT_TST(&revs.diffopt, QUICK))
info.flags |= REV_LIST_QUIET;
for (i = 1 ; i < argc; i++) {