Skip to content

Always add '--' to git reset #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2015
Merged

Always add '--' to git reset #319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions git/refs/head.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand Down