chore: release main

[git-quickbeam]

Release Notes

git-vendor: 1.0.0-alpha.1

1.0.0-alpha.1 (2026-06-01)

Features

• Add ConflictStages carrying [base, ours, theirs] stage versions (0993c27)
• Add Error::Conflict (395b29c)
• Add Error::InvalidName (e535fcf)
• Add Error::InvalidUrl and Error::Fetch variants (b9d4407)
• Add From<gix::repository::merge_base::Error> to Error (73df0c5)
• Add From<merge_trees::Error> and From<tree_merge_options::Error> to Error (31d98a9)
• Add mode config key with squash integration strategy (b6d305e)
• Add vendor_overlay to VendorRepository (4799cb0)
• Add VendorMode enum replacing VendorEntry::squash (b6d305e)
• Add VendorName validated newtype (e535fcf)
• Add VendorWorktree::checkout_vendor_conflicted (395b29c)
• Add committer, author, and message params to commit_vendor (cc46448)
• Add DepotRepository trait and VendorEntry (24f21a7)
• Add Error type with thiserror and impl_gix_from! macro (24f21a7)
• Add exe module with VendorWorktree trait (checkout/track/untrack/sync) (1da7741)
• Add explicit ours commit parameter to VendorRepository::vendor_paths (a5c94e6)
• Add gix index-from-tree and attribute-stack error conversions to Error (098de11)
• Add gix tree-editor and traverse error conversions to Error (f7fe174)
• Add paths to vendor content filter in working-copy .gitattributes (83f7038)
• Add PatternMapping, VendorStatus, VendorMerge, VendorConfig types (1da7741)
• Add VendorConfig::open_from_bytes (33cd3ba)
• Carry merge-stage versions on VendorMerge conflicts (0993c27)
• Define DepotRepository trait and Error type (24f21a7)
• Derive Error::Config for invalid vendor glob patterns (f7fe174)
• Enable gix blocking-network-client feature (b9d4407)
• Enable gix worktree-mutation feature (5bb39fb)
• Enforce vendor name invariant via validated VendorName newtype (e535fcf)
• Filter and remap upstream blobs into local path space in upstream_tree (f7fe174)
• Implement base_tree as upstream_tree at the recorded base (e1c0593)
• Implement checkout_vendor_conflicted (951eb6b)
• Implement checkout_vendor working-copy projection (5bb39fb)
• Implement commit_vendor (b8da2b3)
• Implement commit_vendor using gix::objs::Commit and write_object (b8da2b3)
• Implement fetch_vendor for gix::Repository (b9d4407)
• Implement fetch_vendor with anonymous remote fetch and ref projection (b9d4407)
• Implement merge_vendor in VendorRepository for gix::Repository (31d98a9)
• Implement merge_vendor three-way merge in local path space (31d98a9)
• Implement ours_tree attribute-filtered local snapshot (098de11)
• Implement track_vendor (83f7038)
• Implement untrack_vendor (c760880)
• Implement upstream_tree pattern filtering and remapping (f7fe174)
• Implement vendor_paths, resolving the local selection from .gitattributes (a7bd9d2)
• Implement vendor_status (73df0c5)
• Implement vendor_tip via try_find_reference (e1c0593)
• Implement PatternMapping and VendorConfig (33cd3ba)
• Implement VendorConfig and PatternMapping with tests (33cd3ba)
• Preserve non-UTF-8 ours paths byte-for-byte in ours_tree (098de11)
• Project conflicted merges onto the working copy (951eb6b)
• Record squashed upstream OID as a Squashed-upstream git trailer (b6d305e)
• Refuse to commit conflicted vendor merges and stub conflict checkout (395b29c)
• Reject conflicted VendorMerge in commit_vendor (395b29c)
• Remove sync_attributes method (faa5cf3)
• Remove paths from vendor content filter in working-copy .gitattributes (c760880)
• Select vendor=<name> attributed paths from the ours commit tree in ours_tree (098de11)
• Wire vendor_paths to resolve_vendor_paths (a7bd9d2)

Bug Fixes

• Build the merge commit's tree by overlaying result_tree onto the parent (881d96c)
• Error when all configured patterns are invalid instead of silently emptying the tree (6561041)
• Gate raw_paths helper on #[cfg(unix)] (48f6f51)
• Handle unborn HEAD with no .git/index in checkout_vendor (5bb39fb)
• Harden upstream_tree glob matching and path remapping (3caa4ac)
• Harden upstream_tree pattern indexing, path safety, and traversal (6561041)
• Import ByteSlice trait in non_utf8_filename_is_preserved (48f6f51)
• Pair compiled globs with their PatternMapping to prevent index desync (6561041)
• Refuse local transports (23a6e4e)
• Reject escaping or empty synthesized local paths via gix::validate::path::component (6561041)
• Remove stale vendor symlinks during checkout_vendor (5bb39fb)
• Report Error::Config when a pattern maps to an empty local path (3caa4ac)
• Splice vendored content into the full tree on commit_vendor (881d96c)
• Use gitignore-like glob semantics in upstream_tree so * no longer crosses / (3caa4ac)

---

This release was generated with Release Please.