Skip to content

v2.11.0

v2.11.0 — Conflict-as-success, content completeness, executor option
@cyanheads cyanheads tagged this 19 Apr 18:59 
Surfaced through /field-test against the running server.

Highlights:

- merge / rebase / cherry-pick / pull no longer throw on CONFLICT; they
  return { success: true, conflicts: true, conflictedFiles: [...] } with
  an actionable next-step message. Real failures (no CONFLICT marker)
  still throw.
- New executor option `allowNonZeroExit` lets operations handle git's
  expected non-zero exits (e.g. conflicts) as structured success.
- New result fields: GitPullResult.conflictedFiles, GitResetResult.previousCommit.
- git_reset now reports actual changed files (paths unstaged, files
  differing across HEAD movement, working-tree files discarded by --hard).
- Porcelain leak fixes:
    * git_status — porcelain v2 unmerged path index was wrong, leaking
      blob hashes into conflictedFiles.
    * git_checkout — filesModified leaked literal "M	path" strings.
    * git_pull — filesChanged leaked raw diffstat lines.
- git_init.isBare and git_show.metadata are now in standard verbosity.

Backwards-compatible additive type changes; conflict-handling behavior
change is a deliberate improvement called out in CHANGELOG.
Assets 2
Loading