Skip to content

#611: fix git pull on settings with local branch without remote#1958

Open
Caylipp wants to merge 4 commits into
devonfw:mainfrom
Caylipp:feature/611-fix-git-pull-on-settings-with-local-branch-without-remote
Open

#611: fix git pull on settings with local branch without remote#1958
Caylipp wants to merge 4 commits into
devonfw:mainfrom
Caylipp:feature/611-fix-git-pull-on-settings-with-local-branch-without-remote

Conversation

@Caylipp
Copy link
Copy Markdown
Contributor

@Caylipp Caylipp commented May 20, 2026

This PR fixes #611

Implemented changes:

  • detect missing upstream configuration for the settings repository branch
  • avoid executing rev-parse @{u} when no upstream is configured
  • prevent misleading Git errors for local-only branches without upstream
  • provide a clear warning message to inform the user about incorrect branch setup

Testing instructions

  1. Go to yourproject/settings
  2. Run: git checkout -b testbranch
  3. try to run ide -t update
  4. Verify:
    • no rev-parse @{u} error is shown
    • a clear warning about missing upstream is logged

Checklist for this PR

Make sure everything is checked before merging this PR. For further info please also see
our DoD.

  • When running mvn clean test locally all tests pass and build is successful
  • PR title is of the form #«issue-id»: «brief summary» (e.g. #921: fixed setup.bat). If no issue ID exists, title only.
  • PR top-level comment summarizes what has been done and contains link to addressed issue(s)
  • PR and issue(s) have suitable labels
  • Issue is set to In Progress and assigned to you or there is no issue (might happen for very small PRs)
  • You followed all coding conventions
  • You have added the issue implemented by your PR in CHANGELOG.adoc unless issue is labeled
    with internal
  • You have formulated clear instructions on how to test your contribution under "Testing instructions"

@coveralls
Copy link
Copy Markdown
Collaborator

coveralls commented May 20, 2026

Coverage Report for CI Build 26276395853

Coverage decreased (-0.2%) to 70.91%

Details

  • Coverage decreased (-0.2%) from the base build.
  • Patch coverage: No coverable lines changed in this PR.
  • 98 coverage regressions across 3 files.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

98 previously-covered lines in 3 files lost coverage.

File Lines Losing Coverage Coverage
com/devonfw/tools/ide/git/GitContextImpl.java 95 37.47%
com/devonfw/tools/ide/version/VersionSegment.java 2 88.71%
com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java 1 78.33%

Coverage Stats

Coverage Status
Relevant Lines: 15549
Covered Lines: 11505
Line Coverage: 73.99%
Relevant Branches: 6964
Covered Branches: 4459
Branch Coverage: 64.03%
Branches in Coverage %: Yes
Coverage Strength: 3.13 hits per line

💛 - Coveralls

@Caylipp Caylipp added settings ide-settings repo and replated processes and features git git version management tool integration labels May 21, 2026
@Caylipp Caylipp self-assigned this May 21, 2026
@Caylipp Caylipp changed the title Feature/611 fix git pull on settings with local branch without remote #611: fix git pull on settings with local branch without remote May 21, 2026
@hohwille hohwille moved this from 🆕 New to Team Review in IDEasy board May 21, 2026
Caylipp added 3 commits May 21, 2026 11:53
- 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
@Caylipp Caylipp force-pushed the feature/611-fix-git-pull-on-settings-with-local-branch-without-remote branch from 0dee5b1 to ff9b854 Compare May 21, 2026 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

git git version management tool integration settings ide-settings repo and replated processes and features

Projects

Status: Team Review

Development

Successfully merging this pull request may close these issues.

Git pull on settings with local branch and without remote throws exception

4 participants