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.

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
Changes from all commits
Commits
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
Always add '--' to git reset
If a git repo has the misfortune to have a file with the name "HEAD"
at the root level of the repo, git will return an error because it
is unsure whether the file or ref is meant:

    File "/usr/local/lib/python2.7/dist-packages/git/refs/head.py", line 81, in reset
      self.repo.git.reset(mode, commit, add_arg, paths, **kwargs)
    File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 440, in <lambda>
      return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
    File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 834, in _call_process
      return self.execute(make_call(), **_kwargs)
    File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 627, in execute
      raise GitCommandError(command, status, stderr_value)
  GitCommandError: 'git reset --hard HEAD' returned with exit code 128
  stderr: 'fatal: ambiguous argument 'HEAD': both revision and filename
  Use '--' to separate filenames from revisions'

Implement its suggested fix by always passing '--' as an argument to
"git reset".  It is fine to pass it with no file specifiers afterwords.
In that case, git knows that "HEAD" is always meant as the ref.
  • Loading branch information
jeblair committed Jul 17, 2015
commit bdc38b83f4a6d39603dc845755df49065a19d029
7 changes: 1 addition & 6 deletions git/refs/head.py
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