From 2d4f0683341cb77e75a8656484d3c09a441f9d22 Mon Sep 17 00:00:00 2001
From: Byron <sebastian.thiel@icloud.com>
Date: Sun, 13 Sep 2026 18:04:41 +0200
Subject: [PATCH] fix: reject comments after implicit boolean config keys

Note that this is just a fixup, on a huge hack which is the native
git-config parsing. Let's just hope this holds up until v4.

<!-- agent -->
GitConfigParser accepted entries such as "enabled # comment" and
"enabled ; comment" even though Git rejects them. The comment became
part of the option name, and an equals sign or colon inside the comment
could make the entry look like an assignment. Silently stripping the
comment would also accept configuration that Git considers invalid.

Exclude both comment markers from the shared option-name expression and
require a full-line match for valueless options. The assignment pattern
cannot cross a comment marker, and the valueless fallback cannot accept
just the valid-looking prefix. Such lines now raise the existing
ParsingError during reading or an attempted edit. Ordinary bare keys
retain their implicit true value and round-trip behavior.

Add six regression cases covering both markers, spaces, tabs, adjacent
comments, and assignment delimiters inside comments. Compare rejection
with git config, check both getboolean and an unrelated edit raise
ParsingError, and verify that the failed edit leaves the original bytes
untouched. All six cases failed before full-line matching was added.

Git reference: checkout 1630431f326e15fcde608827b5ff38422528eb59,
config.c:get_value. Without an assignment, that parser requires the
line to end after the key and optional whitespace. Runtime comparisons
used Git 2.50.1 (Apple Git-155), which rejected all six inputs with
exit status 128.

Validation on Python 3.12.14: 42 configuration tests and six regression
subtests passed, with two existing skips. Ruff lint and formatting and
git diff --check passed.

Assisted-by: GPT 6.0
Co-authored-by: GPT 6.0 <codex@openai.com>
---
 git/config.py       |  4 ++--
 test/test_config.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/git/config.py b/git/config.py
index d6f2706f1..cb130579a 100644
--- a/git/config.py
+++ b/git/config.py
@@ -310,7 +310,7 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
     re_comment = re.compile(r"^\s*[#;]")
     # } END configuration
 
-    optvalueonly_source = r"\s*(?P<option>[^:=\s][^:=]*)"
+    optvalueonly_source = r"\s*(?P<option>[^:=\s#;][^:=#;]*)"
 
     OPTVALUEONLY = re.compile(optvalueonly_source)
 
@@ -594,7 +594,7 @@ def parse_value(value: str) -> str:
                     cursect.add(optname, optval)
                 else:
                     # A valueless option is an implicit boolean true, not an empty value.
-                    mo = self.OPTVALUEONLY.match(line)
+                    mo = self.OPTVALUEONLY.fullmatch(line)
                     if mo:
                         optname = self.optionxform(mo.group("option").rstrip())
                         cursect.add(optname, None)
diff --git a/test/test_config.py b/test/test_config.py
index 2910f3e6c..c0fa27f2c 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -917,6 +917,39 @@ def test_implicit_boolean_round_trip(self, rw_dir):
             self.assertIs(config.getboolean("flag", "empty"), False)
             self.assertEqual(dict(config.items_all("flag"))["multiple"], ["false", None, "", None])
 
+    @with_rw_directory
+    def test_implicit_boolean_rejects_comments_like_git(self, rw_dir):
+        config_path = osp.join(rw_dir, "config")
+        comments = (
+            " # comment",
+            " ; comment",
+            "# comment = value",
+            "; comment = value",
+            "\t# comment: value",
+            "\t; comment: value",
+        )
+        for comment in comments:
+            with self.subTest(comment=comment):
+                content = ("[flag]\n\tenabled%s\n" % comment).encode(defenc)
+                with open(config_path, "wb") as config_file:
+                    config_file.write(content)
+
+                result = subprocess.run(
+                    ["git", "config", "--file", config_path, "--bool", "flag.enabled"],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                )
+                self.assertEqual(result.returncode, 128, result.stderr)
+                with GitConfigParser(config_path) as config:
+                    with self.assertRaises(cp.ParsingError):
+                        config.getboolean("flag", "enabled")
+                with GitConfigParser(config_path, read_only=False) as config:
+                    with self.assertRaises(cp.ParsingError):
+                        config.set_value("other", "value", "updated")
+
+                with open(config_path, "rb") as config_file:
+                    self.assertEqual(config_file.read(), content)
+
     def test_config_with_quotes(self):
         cr = GitConfigParser(fixture_path("git_config_with_quotes"), read_only=True)