Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Byron merged 1 commit intogitpython-developers:masterfromjeblair:fixhead
Jul 18, 2015

Conversation

jeblair
Copy link
Contributor

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.

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 itis 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.
Byron added a commit that referenced this pull requestJul 18, 2015
@ByronByron merged commitaf44258 intogitpython-developers:masterJul 18, 2015
@Byron
Copy link
Member

Thank you ! This one was a subtle bug indeed !

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

2 participants
@jeblair@Byron

[8]ページ先頭

©2009-2025 Movatter.jp