While parsing errors, also detecting lines starting with "error:"#297
Merged
Byron merged 1 commit intogitpython-developers:masterfrom Jun 10, 2015
Merged
While parsing errors, also detecting lines starting with "error:"#297Byron merged 1 commit intogitpython-developers:masterfrom
Byron merged 1 commit intogitpython-developers:masterfrom
Conversation
Byron
added a commit
that referenced
this pull request
Jun 10, 2015
Reverted changes of `fe2fbc5~2`. This caused `git-pull` to error, which now actually results in a fatal error while fetching or pulling. Previously we simply didn't check for this issue. Now we are back to a `poll` based or threaded concurrent reading from stdout and stderr to prevent a git process deadlock, and the aforementioned error. Related to #297
Member
|
Thank you ! This actually caused a 'sleeping' issue to show itself, which is now fixed as well. Of course I can only hope this doesn't cause breakage elsewhere, but at least the test-suite is happy with it. |
Member
|
You can watch the development stream on youtube.
|
Author
|
Thanks! Great that i found that latent bug ;) |
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.
Rigth now only the word "fatal:" is being checked but there are also errors that start with "error:", for example:
$ git pull origin master
From github.host.com/mycompany/repo
Updating 49d7506..7de461c
error: Your local changes to the following files would be overwritten by merge:
mydir/myfile.txt
Please, commit your changes or stash them before you can merge.
Aborting