#611: fix git pull on settings with local branch without remote#1958
Open
Caylipp wants to merge 4 commits into
Open
#611: fix git pull on settings with local branch without remote#1958Caylipp wants to merge 4 commits into
Caylipp wants to merge 4 commits into
Conversation
Collaborator
Coverage Report for CI Build 26276395853Coverage decreased (-0.2%) to 70.91%Details
Uncovered ChangesNo uncovered changes found. Coverage Regressions98 previously-covered lines in 3 files lost coverage.
Coverage Stats💛 - Coveralls |
- detect missing upstream configuration for settings repository branch
- avoid executing 'rev-parse @{u}' when no upstream is configured
- prevent misleading git error logs for local-only branches
- provide clear warning message to inform the user about incorrect branch setup
0dee5b1 to
ff9b854
Compare
…cal-branch-without-remote
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
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.
This PR fixes #611
Implemented changes:
rev-parse @{u}when no upstream is configuredTesting instructions
rev-parse @{u}error is shownChecklist for this PR
Make sure everything is checked before merging this PR. For further info please also see
our DoD.
mvn clean testlocally all tests pass and build is successful#«issue-id»: «brief summary»(e.g.#921: fixed setup.bat). If no issue ID exists, title only.In Progressand assigned to you or there is no issue (might happen for very small PRs)with
internal