new file mode 100644
@@ -0,0 +1,66 @@
+From a45e209e84248dbddbbbddae5c31d057ef00bfec Mon Sep 17 00:00:00 2001
+From: Byron <sebastian.thiel@icloud.com>
+Date: Sun, 2 Aug 2026 08:59:57 +0000
+Subject: [PATCH 23/38] Check joined short-option values before Git execution
+
+<!-- agent -->
+GHSA-wvpp-8hx9-p66j reports that unsafe-option checks omitted the value
+joined to a one-character option when split_single_char_options was false. A
+regression test reproduced the mismatch: GitPython checked only -n even though
+it emitted a joined -nVALUE token that Git parses as clustered short options.
+
+Collect the exact joined token for unsplit one-character keyword arguments so
+the existing clustered-short-option validation sees every option character.
+The split form and long-option behavior remain unchanged.
+
+A broader audit confirmed that all guarded keyword-forwarding APIs use
+_option_candidates, including clone, ls-remote, fetch, pull, push, archive,
+revision, diff, checkout-index, and tag paths. Git cf5497b14 confirms repeated
+short-option parsing within a joined token. Focused candidate and unsafe-option
+tests pass.
+
+CVE: CVE-2026-76220
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/96a888f4d782cb2f80452148e48e60ce4af6d541]
+
+Backport Changes:
+- Omit upstream regression test changes because the current PyPI
+ source archive does not include its test suite.
+
+Assisted-by: GPT 5.6
+Co-authored-by: GPT 5.6 <codex@openai.com>
+(cherry picked from commit 96a888f4d782cb2f80452148e48e60ce4af6d541)
+Signed-off-by: Yogita Urade <yurade@cisco.com>
+---
+ git/cmd.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/git/cmd.py b/git/cmd.py
+index f907fa4e..b1aef9d3 100644
+--- a/git/cmd.py
++++ b/git/cmd.py
+@@ -638,13 +638,21 @@ class Git(LazyMixin):
+ values = value if isinstance(value, (list, tuple)) else (value,)
+ if any(value is True or (value is not False and value is not None) for value in values):
+ key = str(key)
+- options.append(f"-{key}" if len(key) == 1 else f"--{dashify(key)}")
+- if len(key) == 1 and split_single_char_options:
++ if len(key) != 1:
++ options.append(f"--{dashify(key)}")
++ elif split_single_char_options:
++ options.append(f"-{key}")
+ options.extend(
+ str(value)
+ for value in values
+ if value is not True and value not in (False, None) and str(value).startswith("-")
+ )
++ else:
++ options.extend(
++ f"-{key}" if value is True else f"-{key}{value}"
++ for value in values
++ if value is True or (value is not False and value is not None)
++ )
+ return options
+ class AutoInterrupt:
+ """Process wrapper that terminates the wrapped process on finalization.
+--
+2.35.6
@@ -36,6 +36,7 @@ SRC_URI += " file://CVE-2026-42284.patch \
file://CVE-2026-73620.patch \
file://CVE-2026-73619.patch \
file://CVE-2026-76221.patch \
+ file://CVE-2026-76220.patch \
"
SRC_URI[sha256sum] = "2d99869e0fef71a73cbd242528105af1d6c1b108c60dfabd994bf292f76c3ceb"
This patch applies the upstream fix as referenced in [2], using the commit shown in [1]. [1] https://github.com/gitpython-developers/GitPython/commit/96a888f4d782cb2f80452148e48e60ce4af6d541 [2] https://www.cve.org/CVERecord?id=CVE-2026-76220 Signed-off-by: Yogita Urade <yurade@cisco.com> --- .../python/python3-git/CVE-2026-76220.patch | 66 +++++++++++++++++++ .../python/python3-git_3.1.42.bb | 1 + 2 files changed, 67 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-76220.patch