summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorJeff Smith <whydoubt@gmail.com>2017-05-24 05:15:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-24 06:41:51 (GMT)
commitc697136229290d5f5d6e6606916d4e77c90877dc (patch)
tree699edde371e6a1550b9b73d90d0ee29864482321 /builtin/blame.c
parent006a0744998804d43a02034bf44b97a163027bb5 (diff)
downloadgit-c697136229290d5f5d6e6606916d4e77c90877dc.zip
git-c697136229290d5f5d6e6606916d4e77c90877dc.tar.gz
git-c697136229290d5f5d6e6606916d4e77c90877dc.tar.bz2
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>
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 7854770..7c493d2 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 @@ parse_done:
sb.ent = blame_sort(sb.ent, compare_blame_final);
- coalesce(&sb);
+ blame_coalesce(&sb);
if (!(output_option & OUTPUT_PORCELAIN))
find_alignment(&sb, &output_option);