Fix checkout when there is a file called HEAD in the repository root #1223
Conversation
This file contains 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
chloeruka
previously requested changes
Jul 20, 2020
There was a problem hiding this comment.
Hey! Thanks for your PR and for your work discovering the bug.
As a general practice, we like to lean on keeping things more verbose to make sure the intention is unambiguous to the reader rather than relying on default behaviour. @matthewd has done a little digging and it looks like appending double dashes at the end of the command e.g. git show HEAD -- would preserve this while also excluding files named 'HEAD' from matching the reference. If you can update this PR I'd consider it ready to merge.
Here's a brief example of how this would fix the issue:
❯ touch HEAD
❯ git --no-pager show HEAD -s --format=fuller --no-color
fatal: ambiguous argument 'HEAD': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
❯ git --no-pager show HEAD -s --format=fuller --no-color --
commit 31ee3e7c99fb06fd1e3412cd9b1c31476f601cce (HEAD -> master, origin/master, origin/HEAD)
Merge: 9861706c 4470cf59
Author: Paul Annesley <[email protected]>
AuthorDate: Wed Jul 15 19:30:25 2020 +1000
Commit: GitHub <[email protected]>
CommitDate: Wed Jul 15 19:30:25 2020 +1000
Problem: `git show HEAD` fails when there is a file called 'HEAD' in the repository root, complaining about ambiguous reference Solution: append '--' to `git show` arguments to indicate that 'HEAD' must be interpreted as a revision
zhenyavinogradov
force-pushed
the
zhenya/git-show-head
branch
from
914bb66 to
7000192
Compare
|
Thanks for replying, I've updated it to use |
pda
approved these changes
Aug 7, 2020
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.
Problem:
git show HEADfails when there is a file called 'HEAD' in therepository root, complaining about ambiguous reference
Solution: call
git showwithout 'HEAD' argument, which will always showthe HEAD commit