Re: [PATCH v2 09/21] bisect: make algorithm behavior independent of DEBUG_BISECT

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 15, 2016, 21:25 UTC
Message-ID: <xmqq8u0ea7k5.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1460294354-7031-10-git-send-email-s-beyer@gmx.net>

Stephan Beyer <s-beyer@gmx.net> writes:

Show 8 quoted lines

> If DEBUG_BISECT is set to 1, bisect does not only show debug
> information but also changes the algorithm behavior: halfway()
> is always false.
>
> This commit makes the algorithm independent of DEBUG_BISECT.
>
> Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
> ---

Another good candidate for preliminary clean-up.

I do not remember what the rationale was to do this short-cut when I wrote it at 1daa09d9 (make the previous optimization work also on path-limited rev-list --bisect, 2007-03-23). Thanks for spotting it.

Show 16 quoted lines

>  bisect.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/bisect.c b/bisect.c
> index 2f54d96..1a13f35 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -101,8 +101,6 @@ static inline int halfway(struct commit_list *p, int nr)
>  	 */
>  	if (p->item->object.flags & TREESAME)
>  		return 0;
> -	if (DEBUG_BISECT)
> -		return 0;
>  	/*
>  	 * 2 and 3 are halfway of 5.
>  	 * 3 is halfway of 6 but 2 and 4 are not.