Re: [PATCH] rev-list: refuse --first-parent combined with --bisect

From: Kevin Daudt <me@ikke.info>
Date: Mar 7, 2015, 23:13 UTC
Message-ID: <20150307231305.GA15619@vps892.directvps.nl>
In-Reply-To: <1425763876-15573-1-git-send-email-me@ikke.info>

On Sat, Mar 07, 2015 at 10:31:16PM +0100, Kevin Daudt wrote:

Show 9 quoted lines

> 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.

Show 5 quoted lines

> +		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++) {