Merge pull request #2047 from EliahKagan/quoted-empty · gitpython-developers/GitPython@646dc16 · 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 646dc16

Browse filesBrowse the repository at this point in the historyBrowse files

EliahKagan

authored

Merge pull request #2047 from EliahKagan/quoted-empty

Remove explicit empty `""` handling in ConfigParser

2 parents 63160de + 2f22524 commit 646dc16
Copy full SHA for 646dc16

3 files changed

+6-3Lines changed: 6 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git
  • config.py
• test
  • fixtures
    • git_config_with_empty_quotes
  • 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

-3Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -501,9 +501,6 @@ def string_decode(v: str) -> str:
501	501	if pos != -1 and optval[pos - 1].isspace():
502	502	optval = optval[:pos]
503	503	optval = optval.strip()
504		- if optval == '""':
505		- optval = ""
506		- # END handle empty string
507	504	optname = self.optionxform(optname.rstrip())
508	505	if len(optval) > 1 and optval[0] == '"' and optval[-1] != '"':
509	506	is_multi_line = True

Collapse file

‎test/fixtures/git_config_with_empty_quotes‎

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	+ filemode = ""

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
@@ -416,6 +416,10 @@ def test_config_with_quotes(self):
416	416	self.assertEqual(cr.get("user", "name"), "Cody Veal")
417	417	self.assertEqual(cr.get("user", "email"), "cveal05@gmail.com")
418	418
	419	+ def test_config_with_empty_quotes(self):
	420	+ cr = GitConfigParser(fixture_path("git_config_with_empty_quotes"), read_only=True)
	421	+ self.assertEqual(cr.get("core", "filemode"), "", "quotes can form a literal empty string as value")
	422	+
419	423	def test_config_with_quotes_with_literal_whitespace(self):
420	424	cr = GitConfigParser(fixture_path("git_config_with_quotes_whitespace_inside"), read_only=True)
421	425	self.assertEqual(cr.get("core", "commentString"), "# ")

0 commit comments

Comments

0 (0)