combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

brian m. carlson committed Aug 18, 2019 at 20:04 UTC 976ff7e49d722d1b72effb6d547ec2b00cd69fc0
1 file changed +1 -1
combine-diff.c
+1 -1
@@ -930,7 +930,7 @@ static void show_combined_header(struct combine_diff_path *elem,
930 int show_file_header)
931 {
932 struct diff_options *opt = &rev->diffopt;
933 - int abbrev = opt->flags.full_index ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV;
933 + int abbrev = opt->flags.full_index ? the_hash_algo->hexsz : DEFAULT_ABBREV;
934 const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";
935 const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";
936 const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO);