Fix uncommitted code error. #303
Merged
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
| @@ -2,8 +2,8 @@ module ReactOnRails | |||
| module GitUtils | |||
| def self.uncommitted_changes?(message_handler) | |||
| return false if ENV["COVERAGE"] | |||
| status = `git status` | |||
| return false if status.include?("nothing to commit, working directory clean") | |||
|
Reviewed 1 of 1 files at r1. Comments from the review on Reviewable.io |
|
@nmatyukov Can you please rebase this on top of master. Then I'll have the auto-merge button. |
ec4e673 to
b62c255
Compare
|
@justin808 Branch was rebased. |
|
Thanks @nmatyukov! |
| @@ -2,8 +2,8 @@ module ReactOnRails | |||
| module GitUtils | |||
| def self.uncommitted_changes?(message_handler) | |||
| return false if ENV["COVERAGE"] | |||
| status = `git status` | |||
| return false if status.include?("nothing to commit, working directory clean") | |||
| status = `git status --porcelain` | |||
There was a problem hiding this comment.
It does not work if I have untracked files
$ git status --porcelain
?? .byebug_history
?? .gitignore
?? .idea/
?? .rspec
?? .rubocop.yml
?? .ruby-gemset
?? .ruby-version
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.
When I tried to install react_on_rails, I got "ERROR: You have uncommitted code. Please commit or stash your changes before continuing." but all of my code were committed.
The problem was in the git localization: "нечего фиксировать, рабочая директория пуста" instead of "nothing to commit, working directory clean" (but both are the same).
Here is the fix that checks on empty git status if no uncommitted changes.