Fix git rev-list when a file exists with the same name as the branch
#1096
Conversation
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
Fixes issue git-lfs#1056. When you try to push `master` but also have a file named `master`, we run `git rev-list ... master`. This is ambiguous, because `rev-list` accepts paths or refs and `git` is unsure whether you mean the ref `master` or the path `master. Instead, run `git rev-list ... master --`, which is unambiguous. This adds a failing test (trying to push a file named `master` to LFS), then fixes the test by appending `--` to the command.
This was referenced Mar 19, 2016
Contributor
|
🤘 thanks! |
sinbad
added a commit
that referenced
this pull request
Mar 22, 2016
Fix `git rev-list` when a file exists with the same name as the branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes issue #1056.
When you try to push
masterbut also have a file namedmaster, we rungit rev-list ... master. This is ambiguous, becauserev-listacceptspaths or refs and
gitis unsure whether you mean the refmasteror thepath
master.Instead, run
git rev-list ... master --, which is unambiguous.This adds a failing test (trying to push a file named
masterto LFS), thenfixes the test by appending
--to the command.