Skip to content

chore: release main#20

Draft
robot-yavanna[bot] wants to merge 1 commit intomainfrom
release-please--branches--main
Draft

chore: release main#20
robot-yavanna[bot] wants to merge 1 commit intomainfrom
release-please--branches--main

Conversation

@robot-yavanna
Copy link
Contributor

@robot-yavanna robot-yavanna bot commented Mar 14, 2026

Release Notes

git-vendor: 1.0.0

1.0.0 (2026-03-14)

⚠ BREAKING CHANGES

  • VendorStatus.upstream_oid replaced by VendorStatus.state (VendorState enum)

Features

  • Add --no-commit flag to merge and pull (6bacd29)
  • Add VendorSource::base_ref() (a4a545c)
  • Add VendorSource::path field and vendor.<name>.path config key (5cb353c)
  • Add CommitMode enum (squash/linear/replay) to VendorSource (6bacd29)
  • Defer base write until after successful commit or staging (5899c16)
  • Enforce invariants from section 8 (5899c16)
  • Error on collision with existing non-vendored files on add (5899c16)
  • Error on overlapping output paths across vendors on add (5899c16)
  • Extend status output with force-push detection (6bacd29)
  • Implement authorship modes for vendor merges (60ac1f3)
  • Linear mode creates single-parent commit on HEAD (60ac1f3)
  • Replay mode replays upstream commits with original author identity (60ac1f3)
  • Squash mode creates synthetic second-parent + merge commit (60ac1f3)
  • Tests/add_vendor.rs (baa5e16)
  • Tests/commit_mode.rs (baa5e16)
  • Tests/fetch.rs (baa5e16)
  • Tests/merge_vendor.rs (baa5e16)
  • Tests/rm.rs (baa5e16)
  • Tests/status.rs (baa5e16)
  • Tests/track_vendor_pattern.rs (baa5e16)
  • Tests/track.rs (baa5e16)
  • VENDOR_MSG conflict variant directs user to git commit -e -F .git/VENDOR_MSG (60ac1f3)
  • VENDOR_MSG includes Updated N files, added/removed/modified counts (60ac1f3)

Bug Fixes

  • Don't introduce unattributed upstream files via merge_vendor (dd8eb64)
  • Merged_index filtered to attributed paths before checkout_and_stage (dd8eb64)
  • Refresh_vendor_attrs uses theirs_tree instead of merged_index (dd8eb64)
  • Remove unused imports and suppress dead code warning in tests (8144ad3)
  • Track_patterns writes and stages attrs for new patterns (7dc7e14)

This release was generated with Release Please.

@robot-yavanna robot-yavanna bot force-pushed the release-please--branches--main branch from 8d8678b to f5884b9 Compare March 14, 2026 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants