Repository navigation
checkout: use empty baseline when no index file exists - #3823
Merged
carlosmn merged 1 commit intoJun 17, 2016
Merged
carlosmn merged 1 commit into
carlosmn merged 1 commit into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
When no index file exists and a baseline is not explicitly provided, use an empty baseline instead of trying to load `HEAD`.
Copy link
Copy Markdown
Member
Author
|
Note that this is still not completely correct: the "is this dirty" checkout conflict handling is not correctly taking the index into account but that's a different (and bigger) issue and I will follow up with a related pull request. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
Seems legit. Or at least we're doing mostly what git does. |
Sorry, something went wrong.
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
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.
When no index file exists and a baseline is not explicitly provided, use an empty baseline instead of trying to use HEAD as the baseline.
This is for compatibility with git:
% git status On branch master nothing to commit, working directory clean % rm .git/index % git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) deleted: README deleted: branch_file.txt deleted: link_to_new.txt deleted: new.txt Untracked files: (use "git add <file>..." to include in what will be committed) README branch_file.txt link_to_new.txt new.txt % git checkout HEAD error: The following untracked working tree files would be overwritten by checkout: README branch_file.txt link_to_new.txt new.txt Please move or remove them before you can switch branches. Aborting % git checkout --force HEAD % git status On branch master nothing to commit, working directory cleanOur previous behavior was to try to load HEAD when the index does not exist, which would simply do a diff between the baseline (HEAD) and the target (again, HEAD), which would be a noop.
Fixes #3811