Always add '--' to git reset#319
Merged
Merged
Conversation
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.
Member
|
Thank you ! This one was a subtle bug indeed ! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
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.