Re: [PATCH 1/1] range-diff: let '--abbrev' option takes effect

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 21, 2023, 22:01 UTC
Message-ID: <xmqqzg96d6f2.fsf@gitster.g>
In-Reply-To: <20230220142444.18739-2-tenglong.tl@alibaba-inc.com>

Teng Long <dyroneteng@gmail.com> writes:

Show 12 quoted lines

> diff --git a/range-diff.c b/range-diff.c
> index 8255ab43..086365df 100644
> --- a/range-diff.c
> +++ b/range-diff.c
> @@ -383,11 +383,14 @@ static void output_pair_header(struct diff_options *diffopt,
>  	const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW);
>  	const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT);
>  	const char *color;
> +	char abbrev = diffopt->abbrev;
> +
> +	if (abbrev < 0)
> +		abbrev = DEFAULT_ABBREV;

OK. I _think_ this explicit defaulting to DEFAULT_ABBREV does not need to exist, as find_unique_abbrev() falls back to the default when given a negative value anyway, but it is good to be explicit.

Will queue.  Thanks.