Merge pull request #2036 from EliahKagan/quoted-whitespace · gitpython-developers/GitPython@cf8029d · GitHub

gitpython-developers / GitPython Public

• Notifications You must be signed in to change notification settings
• Fork 989
• Star 5.2k

• Code
• Issues 8
• Pull requests 2
• Discussions
• Actions
• Security and quality 34
• Insights

Additional navigation options

Commit cf8029d

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

authored

Merge pull request #2036 from EliahKagan/quoted-whitespace

Preserve quoted leading and trailing single-line config var whitespace

2 parents 4dd5d45 + bd2b930 commit cf8029d
Copy full SHA for cf8029d

3 files changed

+7-1Lines changed: 7 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git
  • config.py
• test
  • fixtures
    • git_config_with_quotes_whitespace
  • test_config.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎git/config.py‎

Copy file name to clipboardExpand all lines: git/config.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -509,7 +509,7 @@ def string_decode(v: str) -> str:
509	509	is_multi_line = True
510	510	optval = string_decode(optval[1:])
511	511	elif len(optval) > 1 and optval[0] == '"' and optval[-1] == '"':
512		- optval = optval[1:-1].strip()
	512	+ optval = optval[1:-1]
513	513	# END handle multi-line
514	514	# Preserves multiple values for duplicate optnames.
515	515	cursect.add(optname, optval)

Collapse file

‎test/fixtures/git_config_with_quotes_whitespace‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,2 @@
	1	+ [core]
	2	+ commentString = "# "

Collapse file

‎test/test_config.py‎

Copy file name to clipboardExpand all lines: test/test_config.py

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -412,6 +412,10 @@ def test_config_with_quotes(self):
412	412	self.assertEqual(cr.get("user", "name"), "Cody Veal")
413	413	self.assertEqual(cr.get("user", "email"), "cveal05@gmail.com")
414	414
	415	+ def test_config_with_quotes_with_literal_whitespace(self):
	416	+ cr = GitConfigParser(fixture_path("git_config_with_quotes_whitespace"), read_only=True)
	417	+ self.assertEqual(cr.get("core", "commentString"), "# ")
	418	+
415	419	def test_get_values_works_without_requiring_any_other_calls_first(self):
416	420	file_obj = self._to_memcache(fixture_path("git_config_multiple"))
417	421	cr = GitConfigParser(file_obj, read_only=True)

0 commit comments

Comments

0 (0)