From f07f83fd458772ff528579715b538dbb77447e3e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 4 Sep 2026 02:50:06 +0100 Subject: [PATCH] Fix UnicodeDecodeError in `git_check_deviation` (#26439) Fix UnicodeDecodeError in git_check_deviation Decode git log output to bytes to prevent Unicode errors. --- lib/python/qmk/git.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python/qmk/git.py b/lib/python/qmk/git.py index f61e0bdb474..87cde9f427f 100644 --- a/lib/python/qmk/git.py +++ b/lib/python/qmk/git.py @@ -134,7 +134,8 @@ def git_check_deviation(active_branch): """Return True if branch has custom commits """ cli.run(['git', 'fetch', 'upstream', active_branch]) - deviations = cli.run(['git', '--no-pager', 'log', f'upstream/{active_branch}...{active_branch}']) + # As we only care about exit code, decode to bytes to avoid UnicodeDecodeError + deviations = cli.run(['git', '--no-pager', 'log', f'upstream/{active_branch}...{active_branch}'], text=False) return bool(deviations.returncode)