From: Jeff Smith <whydoubt@gmail.com>
Date: Wed, 24 May 2017 05:15:15 +0000 (-0500)
Subject: blame: rename coalesce function
X-Git-Tag: v2.14.0-rc0~108^2~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c697136229290d5f5d6e6606916d4e77c90877dc

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>
---

diff --git a/builtin/blame.c b/builtin/blame.c
index 7854770d85..7c493d2b99 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -384,7 +384,7 @@ static void sanity_check_refcnt(struct blame_scoreboard *);
  * contiguous lines in the same origin (i.e. <commit, path> pair),
  * merge them together.
  */
-static void coalesce(struct blame_scoreboard *sb)
+static void blame_coalesce(struct blame_scoreboard *sb)
 {
 	struct blame_entry *ent, *next;
 
@@ -2885,7 +2885,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 
 	sb.ent = blame_sort(sb.ent, compare_blame_final);
 
-	coalesce(&sb);
+	blame_coalesce(&sb);
 
 	if (!(output_option & OUTPUT_PORCELAIN))
 		find_alignment(&sb, &output_option);