Merge pull request gitpython-developers#341 from StyXman/master

Byron · Byron · commit 1d768f67bd49 · 2015-08-21T23:52:31.000+02:00
fix(cmd): make short options with arguments become two separate argum…
diff --git a/git/cmd.py b/git/cmd.py
@@ -700,7 +700,7 @@ def custom_environment(self, **kwargs):
         finally:
             self.update_environment(**old_env)
 
-    def transform_kwargs(self, split_single_char_options=False, **kwargs):
+    def transform_kwargs(self, split_single_char_options=True, **kwargs):
         """Transforms Python style kwargs into git command line options."""
         args = list()
         for k, v in kwargs.items():
diff --git a/git/test/test_git.py b/git/test/test_git.py
@@ -65,7 +65,7 @@ def test_it_raises_errors(self):
 
     def test_it_transforms_kwargs_into_git_command_arguments(self):
         assert_equal(["-s"], self.git.transform_kwargs(**{'s': True}))
-        assert_equal(["-s5"], self.git.transform_kwargs(**{'s': 5}))
+        assert_equal(["-s", "5"], self.git.transform_kwargs(**{'s': 5}))
 
         assert_equal(["--max-count"], self.git.transform_kwargs(**{'max_count': True}))
         assert_equal(["--max-count=5"], self.git.transform_kwargs(**{'max_count': 5}))
