Skip to content

While parsing errors, also detecting lines starting with "error:" #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2015

Conversation

victorgp
Copy link

@victorgp victorgp commented Jun 9, 2015

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

  • branch master -> FETCH_HEAD
    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

@Byron Byron added this to the v1.0.2 - Fixes milestone Jun 10, 2015
@Byron Byron self-assigned this Jun 10, 2015
@Byron Byron merged commit 3e79604 into gitpython-developers:master Jun 10, 2015
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
@Byron
Copy link
Member

Byron commented Jun 10, 2015

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.

@Byron
Copy link
Member

Byron commented Jun 10, 2015

You can watch the development stream on youtube.

GitPython #6 [merge PR 297 - uncover and fix a latent bug]

thumb

@victorgp
Copy link
Author

Thanks! Great that i found that latent bug ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants