From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2026 22:55:55 GMT
Subject: Re: [PATCH 7/8] checkout: wrap overly long lines
Message-ID: <xmqqcxv13ldw.fsf@gitster.g>
In-Reply-To: <20260828225206.310500-8-gitster@pobox.com>

Junio C Hamano <gitster@pobox.com> writes:

> So far, the patches in this series have tried to leave the original
> code intact as much as possible when moving it, to make the
> refactoring easier to review.
>
> However, there are quite a few overly long lines that are hard to
> read.  There are also several manual checks for mutually
> incompatible options where die_for_incompatible_optN() could be
> used instead.
>
> Now that most of the refactoring is complete, tidy up these warts to
> finish off the series.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  builtin/checkout.c | 54 +++++++++++++++++++++++++++++-----------------
>  1 file changed, 34 insertions(+), 20 deletions(-)
> ...
> +	die_for_incompatible_opt3(opts->new_branch,
> +				  new_branch_opt,
> +				  opts->new_new_branch_force,

Editor slip.  This should of course be "opts->new_branch_force".

> +				  new_branch_force_opt,
> +				  opts->new_orphan_branch, "--orphan");