diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-07-18 10:12:42 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-07-18 10:12:42 +0200 |
| commit | af44258fa472a14ff25b4715f1ab934d177bf1fa (patch) | |
| tree | 78fe670c821f4820fb4e9082a78d86b4afabe2bb | |
| parent | b21e2f1c0fdef32e7c6329e2bc1b4ce2a7041a2b (diff) | |
| parent | bdc38b83f4a6d39603dc845755df49065a19d029 (diff) | |
| download | gitpython-af44258fa472a14ff25b4715f1ab934d177bf1fa.tar.gz | |
Merge pull request #319 from jeblair/fixhead
Always add '--' to git reset
| -rw-r--r-- | git/refs/head.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git/refs/head.py b/git/refs/head.py index 18dac349..06207e0a 100644 --- a/git/refs/head.py +++ b/git/refs/head.py @@ -55,7 +55,6 @@ class HEAD(SymbolicReference): :return: self""" mode = "--soft" - add_arg = None if index: mode = "--mixed" @@ -73,12 +72,8 @@ class HEAD(SymbolicReference): # 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 |