зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
703d2d4193
Коммит
976ff7e49d
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче