-
-
Notifications
You must be signed in to change notification settings - Fork 185
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
Fetch instead of pull if the working tree isn't tracking remote. #286
Conversation
Pull Request Test Coverage Report for Build 139766044
💛 - Coveralls |
After I submit this PR, I found that we can judge the condition with the exit code of Note: The 2 conditions are not same when the upstream is set and deleted.
|
@{u} is also a bit better about the range of git versions it supports.
|
Yes, I also had trouble with this behavior when bundle updating. It's a good fix. This change looks generally good. I'll check it out later. |
## [v1.1.2](v1.1.1...v1.1.2) (2020-06-21) * update deps [#287](#287) ([Songmu](https://github.com/Songmu)) * Fetch instead of pull if the working tree isn't tracking remote. [#286](#286) ([yoichi](https://github.com/yoichi)) * Refactor so that RemoteRepository#VCS can return an error [#285](#285) ([johejo](https://github.com/johejo))
Pull Request Test Coverage Report for Build 139610110Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
Problem
I'm using ghq on a git repository. ghq get -u gives an error when I'm on a branch that has not been pushed to the remote.
Proposal
Invoke git fetch instead of git pull in such situation.
How to reproduce