Merge pull request gitpython-developers#319 from jeblair/fixhead

Byron · Byron · commit af44258fa472 · 2015-07-18T10:12:42.000+02:00
Always add '--' to git reset
diff --git a/git/refs/head.py b/git/refs/head.py
@@ -55,7 +55,6 @@ def reset(self, commit='HEAD', index=True, working_tree=False,
 
         :return: self"""
         mode = "--soft"
-        add_arg = None
         if index:
             mode = "--mixed"
 
@@ -73,12 +72,8 @@ def reset(self, commit='HEAD', index=True, working_tree=False,
 
         # END working tree handling
 
-        if paths:
-            add_arg = "--"
-        # END nicely separate paths from rest
-
         try:
-            self.repo.git.reset(mode, commit, add_arg, paths, **kwargs)
+            self.repo.git.reset(mode, commit, '--', paths, **kwargs)
         except GitCommandError as e:
             # git nowadays may use 1 as status to indicate there are still unstaged
             # modifications after the reset
