combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

bk2204 · gitster · commit 976ff7e49d72 · 2019-08-19T15:04:58.000-07:00
Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -930,7 +930,7 @@ static void show_combined_header(struct combine_diff_path *elem,`
`930`	`930`	`int show_file_header)`
`931`	`931`	`{`
`932`	`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`	`934`	`const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";`
`935`	`935`	`const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";`
`936`	`936`	`const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO);`