blame: rename coalesce function

Functions that will be publicly exposed should have names that better
reflect what they are a part of.

Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Smith 2017-05-24 00:15:15 -05:00 коммит произвёл Junio C Hamano
Родитель 006a074499
Коммит c697136229
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -384,7 +384,7 @@ static void sanity_check_refcnt(struct blame_scoreboard *);
* contiguous lines in the same origin (i.e. <commit, path> pair), * contiguous lines in the same origin (i.e. <commit, path> pair),
* merge them together. * merge them together.
*/ */
static void coalesce(struct blame_scoreboard *sb) static void blame_coalesce(struct blame_scoreboard *sb)
{ {
struct blame_entry *ent, *next; struct blame_entry *ent, *next;
@ -2885,7 +2885,7 @@ parse_done:
sb.ent = blame_sort(sb.ent, compare_blame_final); sb.ent = blame_sort(sb.ent, compare_blame_final);
coalesce(&sb); blame_coalesce(&sb);
if (!(output_option & OUTPUT_PORCELAIN)) if (!(output_option & OUTPUT_PORCELAIN))
find_alignment(&sb, &output_option); find_alignment(&sb, &output_option);