Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Byron merged 1 commit intogitpython-developers:masterfromvictorgp:master
Jun 10, 2015

Conversation

victorgp
Copy link

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

@ByronByron added this to thev1.0.2 - Fixes milestoneJun 10, 2015
@ByronByron self-assigned thisJun 10, 2015
@ByronByron merged commit3e79604 intogitpython-developers:masterJun 10, 2015
Byron added a commit that referenced this pull requestJun 10, 2015
Reverted changes of `fe2fbc5~2`.This caused `git-pull` to error, which now actually results in a fatalerror while fetching or pulling. Previously we simply didn't checkfor this issue.Now we are back to a `poll` based or threaded concurrent reading fromstdout and stderr to prevent a git process deadlock, and theaforementioned error.Related to#297
@Byron
Copy link
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.

@Byron
Copy link
Member

You can watch the development streamon 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 freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees

@ByronByron

Labels
None yet
Milestone
v1.0.2 - Fixes
Development

Successfully merging this pull request may close these issues.

2 participants
@victorgp@Byron

[8]ページ先頭

©2009-2025 Movatter.jp