From b66c22e1fb977bf8dd3797ebedc28fbe28f0305e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Barschkis?= <sebbas@sebbas.org>
Date: Tue, 9 Mar 2021 09:55:28 +0100
Subject: [PATCH] Credits: Fix duplicate credit users
Normalization ensures correct grouping of names with special chars.
---
utils/credits_git_gen.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/utils/credits_git_gen.py b/utils/credits_git_gen.py
index 2e45047..14c3ce8 100755
--- a/utils/credits_git_gen.py
+++ b/utils/credits_git_gen.py
@@ -27,7 +27,7 @@ Example use:
"""
from git_log import GitCommit, GitCommitIter
-
+import unicodedata as ud
# -----------------------------------------------------------------------------
# Class for generating credits
@@ -52,7 +52,8 @@ class Credits:
self.users = {}
def process_commit(self, c):
- author = c.author
+ # Normalize author string into canonical form, prevents duplicate credit users
+ author = ud.normalize('NFC', c.author)
year = c.date.year
cu = self.users.get(author)
if cu is None:
--
GitLab