diff options
| author | Jeff Smith <whydoubt@gmail.com> | 2017-05-24 07:15:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-24 08:41:51 +0200 |
| commit | c697136229290d5f5d6e6606916d4e77c90877dc (patch) | |
| tree | 699edde371e6a1550b9b73d90d0ee29864482321 | |
| parent | blame: rename origin-related functions (diff) | |
| download | git-c697136229290d5f5d6e6606916d4e77c90877dc.tar.xz git-c697136229290d5f5d6e6606916d4e77c90877dc.zip | |
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>
| -rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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); |