From: brian m. carlson Date: Sun, 18 Aug 2019 20:04:12 GMT Subject: [PATCH 11/26] combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo Message-ID: <20190818200427.870753-12-sandals@crustytoothpaste.net> In-Reply-To: <20190818200427.870753-1-sandals@crustytoothpaste.net> Signed-off-by: brian m. carlson --- combine-diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/combine-diff.c b/combine-diff.c index 3e49f3bda8..d5c4d839dc 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -930,7 +930,7 @@ static void show_combined_header(struct combine_diff_path *elem, int show_file_header) { struct diff_options *opt = &rev->diffopt; - int abbrev = opt->flags.full_index ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV; + int abbrev = opt->flags.full_index ? the_hash_algo->hexsz : DEFAULT_ABBREV; const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/"; const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/"; const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO);