Skip to content

Fix error detection for current Git output - #632

Closed
sergiou87 wants to merge 1 commit into
mainfrom
fix/current-git-error-patterns
Closed

sergiou87 wants to merge 1 commit into
mainfrom
fix/current-git-error-patterns

Conversation

@sergiou87

Copy link
Copy Markdown
Member

Summary

Update three error classifications while preserving legacy diagnostics:

  • Accept lowercase and legacy uppercase branch rename failures.
  • Recognize current and legacy revert-conflict advice, including git revert --no-commit.
  • Recognize staged, unstaged, and combined changes blocking rebase or pull with rebase.

Revert-specific diagnostics take priority over generic merge-conflict output. Detection still requires conflict advice rather than treating every failed revert as a conflict.

Add 30 regression tests covering nine real bundled Git scenarios, legacy output, CRLF line endings, negative cases, and classification ordering. Document the supported behavior.

Validation

  • Confirmed 14 new tests failed before changing the patterns.
  • All 115 tests pass after the fix.
  • Library, declarations, and examples build successfully.
  • Formatting and diff checks pass.
  • Runtime validation used bundled macOS Git 2.53.0.
  • Windows runtime validation remains for CI; matching producers were verified in Git for Windows v2.53.0.windows.4.

Recognize current and legacy branch rename and revert conflict diagnostics, and staged or unstaged changes blocking rebase. Prioritize revert-specific advice over generic merge conflicts and cover real bundled Git failures alongside legacy and negative cases.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@sergiou87 sergiou87 closed this Sep 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant