Re: [PATCH] Avoid warning when bisecting a merge

[Christian Couder <chriscool@xxxxxxxxxxxxx>]

Le jeudi 4 septembre 2008, Gustaf Hendeby a écrit :
> Trying to compare an empty string as a number results in an error,
> hence make sure checkout_done is set before using it.

This patch seems to work fine. 

> Signed-off-by: Gustaf Hendeby <hendeby@xxxxxxxxxx>

Acked-by: Christian Couder <chriscool@xxxxxxxxxxxxx>

Thanks,
Christian.

PS: After thinking about it, I wonder if we should remove $checkout_done 
entirely and use the return value from "check_merge_bases" 
and "check_good_are_ancestors_of_bad" to know if a checkout was done.

> ---
>
> This one should go on top of cc/bisect.
>
> /Gustaf
>
>  git-bisect.sh |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/git-bisect.sh b/git-bisect.sh
> index 69a9a56..05d14b3 100755
> --- a/git-bisect.sh
> +++ b/git-bisect.sh
> @@ -437,6 +437,7 @@ bisect_next() {
>  		"refs/bisect/skip-*" | tr '\012' ' ') &&
>
>  	# Maybe some merge bases must be tested first
> +	checkout_done=0
>  	check_good_are_ancestors_of_bad "$bad" "$good" "$skip" || exit
>  	test "$checkout_done" -eq "1" && checkout_done='' && return


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html