Merge pull request #431 from guyzmo/fix-opt_arg-order

Byron · Byron · commit 00452efe6c74 · 2016-05-19T13:58:31.000+02:00
Fix order of operators before executing the git command
diff --git a/git/cmd.py b/git/cmd.py
@@ -13,6 +13,8 @@
 import errno
 import mmap
 
+from collections import OrderedDict
+
 from contextlib import contextmanager
 import signal
 from subprocess import (
@@ -783,6 +785,7 @@ def transform_kwarg(self, name, value, split_single_char_options):
 def transform_kwargs(self, split_single_char_options=True, **kwargs):
 """Transforms Python style kwargs into git command line options."""
 args = list()
+ kwargs = OrderedDict(sorted(kwargs.items(), key=lambda x: x[0]))
 for k, v in kwargs.items():
 if isinstance(v, (list, tuple)):
 for value in v:

-Original file line number
+Diff line change
 importerrno
 importmmap
 +fromcollectionsimportOrderedDict
++
 fromcontextlibimportcontextmanager
 importsignal
 fromsubprocessimport (
 deftransform_kwargs(self, split_single_char_options=True, **kwargs):
 """Transforms Python style kwargs into git command line options."""
 args=list()
 +kwargs=OrderedDict(sorted(kwargs.items(), key=lambdax: x[0]))
 fork, vinkwargs.items():
 ifisinstance(v, (list, tuple)):
 forvalueinv: