diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2019-08-18 20:04:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 15:04:58 -0700 |
| commit | 976ff7e49d722d1b72effb6d547ec2b00cd69fc0 (patch) | |
| tree | 5b6bfc6c667f0028bf1a3026a5ee9e322ad3f766 /combine-diff.c | |
| parent | 703d2d4193738526d7b4116657657101e49a601e (diff) | |
| download | git-976ff7e49d722d1b72effb6d547ec2b00cd69fc0.tar.gz | |
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>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |