review

- [P2] Preserve balanced quote state after removing comments —
  git/config.py:596-596 For valid Git syntax such as `k = "foo"bar # "note"`
  followed by `x = keep`, stripping produces `"foo"bar`, which the subsequent
  last-character check misclassifies as an open multiline quote. On `main`, `x`
  and later sections remained separate entries; this change absorbs them into
  `k`, and writing an unrelated setting removes them from the config. Classify
  the stripped value using its actual quote state and add a regression test
  covering subsequent settings.

Assisted-by: GPT 6.0
Co-authored-by: GPT 6.0 <codex@openai.com>

Author: Byron

git/config.py

@@ -511,8 +511,8 @@ def is_line_continuation(value: str) -> bool:
                     return False
             return escaped
 
-        def strip_inline_comment(value: str) -> str:
-            """Cut an unquoted ``#`` or ``;`` comment, as git's ``parse_value`` does.
+        def strip_inline_comment(value: str) -> Tuple[str, bool]:
+            """Cut an unquoted ``#`` or ``;`` comment and report whether a quote is open.
 
             Quoting and backslash escapes are honoured, so a ``#`` inside a quoted
             value is literal and an unterminated quote swallows the rest of the line.
@@ -526,8 +526,8 @@ def strip_inline_comment(value: str) -> str:
                 elif char == '"':
                     quoted = not quoted
                 elif char in "#;" and not quoted:
-                    return value[:index]
-            return value
+                    return value[:index], False
+            return value, quoted
 
         def parse_value(value: str) -> str:
             parsed: List[str] = []
@@ -593,7 +593,8 @@ def parse_value(value: str) -> str:
                     optname, vi, optval = mo.group("option", "vi", "value")
                     optname = self.optionxform(optname.rstrip())
 
-                    optval = strip_inline_comment(optval).strip()
+                    optval, quote_open = strip_inline_comment(optval)
+                    optval = optval.strip()
 
                     if len(optval) < 2 or optval[0] != '"':
                         # Does not open quoting.
@@ -620,12 +621,12 @@ def parse_value(value: str) -> str:
                             continued = True
                         if continued:
                             optval = parse_value(optval)
-                    elif optval[-1] != '"':
+                    elif quote_open:
                         # Opens quoting and does not close: appears to start multi-line quoting.
                         is_multi_line = True
                         optval = string_decode(optval[1:])
                     elif re.search(r'(?:^|[^\\])(?:\\\\)*"', optval[1:-1]):
-                        # Preserve malformed values containing unescaped quotes.
+                        # Preserve values containing additional unescaped quotes.
                         pass
                     else:
                         # Opens and closes quoting.

test/test_config.py

@@ -262,6 +262,28 @@ def test_inline_comments_are_stripped_like_git(self):
             with self.subTest(content=content):
                 self.assertEqual(config.get_value("a", "k"), expected)
 
+    @with_rw_directory
+    def test_inline_comments_preserve_balanced_quotes_and_following_settings(self, rw_dir):
+        config_path = osp.join(rw_dir, "config")
+        values = (b'"foo"bar', b'"foo\\"bar"baz', b'"foo#;bar"baz')
+        for value in values:
+            for comment in (b' # "note"', b' ; "note"'):
+                with self.subTest(value=value, comment=comment):
+                    with open(config_path, "wb") as config_file:
+                        config_file.write(b"[a]\n\tk = " + value + comment + b"\n\tx = keep\n[b]\n\ty = stay\n")
+
+                    with GitConfigParser(config_path, read_only=False) as config:
+                        self.assertEqual(config.get_value("a", "k"), value.decode(defenc))
+                        self.assertEqual(config.get_value("a", "x"), "keep")
+                        self.assertEqual(config.get_value("b", "y"), "stay")
+                        config.set_value("other", "value", "updated")
+
+                    with GitConfigParser(config_path) as config:
+                        self.assertEqual(config.get_value("a", "k"), value.decode(defenc))
+                        self.assertEqual(config.get_value("a", "x"), "keep")
+                        self.assertEqual(config.get_value("b", "y"), "stay")
+                        self.assertEqual(config.get_value("other", "value"), "updated")
+
     def test_backslash_line_continuation(self):
         """An unquoted value ending in a backslash continues on the next line,
         exactly as git config parses it: the final backslash and the newline