diff options
Diffstat (limited to 'third_party/git/combine-diff.c')
| -rw-r--r-- | third_party/git/combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/combine-diff.c b/third_party/git/combine-diff.c index d5c4d839dcf2..3e49f3bda84b 100644 --- a/third_party/git/combine-diff.c +++ b/third_party/git/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 ? the_hash_algo->hexsz : DEFAULT_ABBREV; + int abbrev = opt->flags.full_index ? GIT_SHA1_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); |