Skip to content

Commit a8591a0

Browse files
andrewrabertByron
authored andcommitted
Exclude kwarg when None
1 parent b3d9b8d commit a8591a0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

‎git/cmd.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,15 +885,15 @@ def transform_kwarg(self, name, value, split_single_char_options):
885885
iflen(name) ==1:
886886
ifvalueisTrue:
887887
return ["-%s"%name]
888-
eliftype(value) isnotbool:
888+
elifvaluenotin (False, None):
889889
ifsplit_single_char_options:
890890
return ["-%s"%name, "%s"%value]
891891
else:
892892
return ["-%s%s"% (name, value)]
893893
else:
894894
ifvalueisTrue:
895895
return ["--%s"%dashify(name)]
896-
eliftype(value) isnotbool:
896+
elifvaluenotin (False, None):
897897
return ["--%s=%s"% (dashify(name), value)]
898898
return []
899899

‎git/test/test_git.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,15 @@ def test_it_raises_errors(self):
8282
deftest_it_transforms_kwargs_into_git_command_arguments(self):
8383
assert_equal(["-s"], self.git.transform_kwargs(**{'s': True}))
8484
assert_equal(["-s", "5"], self.git.transform_kwargs(**{'s': 5}))
85+
assert_equal([], self.git.transform_kwargs(**{'s': None}))
8586

8687
assert_equal(["--max-count"], self.git.transform_kwargs(**{'max_count': True}))
8788
assert_equal(["--max-count=5"], self.git.transform_kwargs(**{'max_count': 5}))
89+
assert_equal([], self.git.transform_kwargs(**{'max_count': None}))
8890

8991
# Multiple args are supported by using lists/tuples
9092
assert_equal(["-L", "1-3", "-L", "12-18"], self.git.transform_kwargs(**{'L': ('1-3', '12-18')}))
91-
assert_equal(["-C", "-C"], self.git.transform_kwargs(**{'C': [True, True]}))
93+
assert_equal(["-C", "-C"], self.git.transform_kwargs(**{'C': [True, True, None, False]}))
9294

9395
# order is undefined
9496
res=self.git.transform_kwargs(**{'s': True, 't': True})

0 commit comments

Comments
(0)