From 512d00c41dbf105997cae3e06079aabfa72643e5 Mon Sep 17 00:00:00 2001 From: "robot-yavanna[bot]" <264059672+robot-yavanna[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2026 04:04:54 +0000 Subject: [PATCH] chore: release main --- .config/release-please-manifest.json | 2 +- Cargo.lock | 2 +- crates/git-vendor/CHANGELOG.md | 59 ++++++++++++++++++++++++++++ crates/git-vendor/Cargo.toml | 2 +- 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/.config/release-please-manifest.json b/.config/release-please-manifest.json index ac48b12..5827bb7 100644 --- a/.config/release-please-manifest.json +++ b/.config/release-please-manifest.json @@ -1,4 +1,4 @@ { - "crates/git-vendor": "0.2.0", + "crates/git-vendor": "1.0.0", "crates/git-set-attr": "0.1.2" } diff --git a/Cargo.lock b/Cargo.lock index 560a250..ac3bff6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,7 +259,7 @@ dependencies = [ [[package]] name = "git-vendor" -version = "0.2.0" +version = "1.0.0" dependencies = [ "clap", "clap_mangen", diff --git a/crates/git-vendor/CHANGELOG.md b/crates/git-vendor/CHANGELOG.md index 42379ca..e2a29a4 100644 --- a/crates/git-vendor/CHANGELOG.md +++ b/crates/git-vendor/CHANGELOG.md @@ -1,5 +1,64 @@ # Changelog +## [1.0.0](https://github.com/git-ents/git-vendor/compare/git-vendor-v0.2.0...git-vendor-v1.0.0) (2026-03-23) + + +### ⚠ BREAKING CHANGES + +* combine list and check into a single status command +* draft v1 specification +* VendorStatus.upstream_oid replaced by VendorStatus.state (VendorState enum) + +### Features + +* Add --no-commit flag to merge and pull ([6bacd29](https://github.com/git-ents/git-vendor/commit/6bacd29d9a45c296b82f9e7d7c54caf69bd0d1a0)) +* Add `vendor status` command ([f912866](https://github.com/git-ents/git-vendor/commit/f91286631fd6586705f3ec87d6590c6b2d766d2a)) +* Add `VendorSource::base_ref()` ([a4a545c](https://github.com/git-ents/git-vendor/commit/a4a545cd7ca440b00343fad39eabe6421d7477f1)) +* Add `VendorSource::path` field and `vendor..path` config key ([5cb353c](https://github.com/git-ents/git-vendor/commit/5cb353c5bf758c0c7b3c412678b5b05ce28ac7c8)) +* Add CommitMode enum (squash/linear/replay) to VendorSource ([6bacd29](https://github.com/git-ents/git-vendor/commit/6bacd29d9a45c296b82f9e7d7c54caf69bd0d1a0)) +* Defer base write until after successful commit or staging ([5899c16](https://github.com/git-ents/git-vendor/commit/5899c16251601abf101ff65fc6e63407c930026e)) +* Enforce invariants from section 8 ([5899c16](https://github.com/git-ents/git-vendor/commit/5899c16251601abf101ff65fc6e63407c930026e)) +* Error on collision with existing non-vendored files on add ([5899c16](https://github.com/git-ents/git-vendor/commit/5899c16251601abf101ff65fc6e63407c930026e)) +* Error on overlapping output paths across vendors on add ([5899c16](https://github.com/git-ents/git-vendor/commit/5899c16251601abf101ff65fc6e63407c930026e)) +* Extend status output with force-push detection ([6bacd29](https://github.com/git-ents/git-vendor/commit/6bacd29d9a45c296b82f9e7d7c54caf69bd0d1a0)) +* Implement authorship modes for vendor merges ([60ac1f3](https://github.com/git-ents/git-vendor/commit/60ac1f37217c17ca00591c32a96b5a38e9658234)) +* Linear mode creates single-parent commit on HEAD ([60ac1f3](https://github.com/git-ents/git-vendor/commit/60ac1f37217c17ca00591c32a96b5a38e9658234)) +* Pub fn vendor_ref(name: &str) -> String in lib.rs ([5ee296c](https://github.com/git-ents/git-vendor/commit/5ee296c5e673f6978688a1c67547aca91e5d4352)) +* Replay mode replays upstream commits with original author identity ([60ac1f3](https://github.com/git-ents/git-vendor/commit/60ac1f37217c17ca00591c32a96b5a38e9658234)) +* Squash mode creates synthetic second-parent + merge commit ([60ac1f3](https://github.com/git-ents/git-vendor/commit/60ac1f37217c17ca00591c32a96b5a38e9658234)) +* Tests/add_vendor.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* Tests/commit_mode.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* Tests/fetch.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* Tests/merge_vendor.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* Tests/rm.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* Tests/status.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* Tests/track_vendor_pattern.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* Tests/track.rs ([baa5e16](https://github.com/git-ents/git-vendor/commit/baa5e161849390ba86e8c170c503843bb3b5c329)) +* VENDOR_MSG conflict variant directs user to git commit -e -F .git/VENDOR_MSG ([60ac1f3](https://github.com/git-ents/git-vendor/commit/60ac1f37217c17ca00591c32a96b5a38e9658234)) +* VENDOR_MSG includes Updated N files, added/removed/modified counts ([60ac1f3](https://github.com/git-ents/git-vendor/commit/60ac1f37217c17ca00591c32a96b5a38e9658234)) +* Write .gitattributes to dest subdirectory when --path is used ([bac50e5](https://github.com/git-ents/git-vendor/commit/bac50e529a1b9537a8645ea431366a24daccf86a)) +* Write .gitattributes to destination subdirectory for --path vendors ([bac50e5](https://github.com/git-ents/git-vendor/commit/bac50e529a1b9537a8645ea431366a24daccf86a)) + + +### Bug Fixes + +* Check gitattributes path relative to workdir, not CWD ([0a4f674](https://github.com/git-ents/git-vendor/commit/0a4f67472fe9331be66a5c14fa481b434ecd00ec)) +* Don't introduce unattributed upstream files via merge_vendor ([dd8eb64](https://github.com/git-ents/git-vendor/commit/dd8eb6403e6e221c089ec1def536fbbedfcc9bf1)) +* Hard-error on non-vendored file collision in add ([7b8fc0e](https://github.com/git-ents/git-vendor/commit/7b8fc0e509792f66ea49c48965f6a2890668fdb3)) +* Merged_index filtered to attributed paths before checkout_and_stage ([dd8eb64](https://github.com/git-ents/git-vendor/commit/dd8eb6403e6e221c089ec1def536fbbedfcc9bf1)) +* Refresh_vendor_attrs uses theirs_tree instead of merged_index ([dd8eb64](https://github.com/git-ents/git-vendor/commit/dd8eb6403e6e221c089ec1def536fbbedfcc9bf1)) +* Remove unused imports and suppress dead code warning in tests ([8144ad3](https://github.com/git-ents/git-vendor/commit/8144ad37dd1e90d953a6586ed6f2150f8e21bce3)) +* Stage refreshed .gitattributes before filtering merged index ([c2a6ec7](https://github.com/git-ents/git-vendor/commit/c2a6ec79a91409b407a5d2d667de3bc93d8fc484)) +* Track_patterns writes and stages attrs for new patterns ([7dc7e14](https://github.com/git-ents/git-vendor/commit/7dc7e146b52d6bbd5f9f1dc3eec6eca64b93fd74)) +* Use three-way merge in replay mode instead of bare tree replacement ([d47dba8](https://github.com/git-ents/git-vendor/commit/d47dba84da2c22bcb8716a975566491b1cab9970)) +* Write vendor attributes after checkout to avoid clobbering ([c440437](https://github.com/git-ents/git-vendor/commit/c4404370dd3c39b55c11e53d2e6743d03b9e5e95)) + + +### Code Refactoring + +* Combine list and check into a single status command ([f912866](https://github.com/git-ents/git-vendor/commit/f91286631fd6586705f3ec87d6590c6b2d766d2a)) +* Draft v1 specification ([9324022](https://github.com/git-ents/git-vendor/commit/932402235bbd7a9b680630da91dbf2f60a72a838)) + ## [0.2.0](https://github.com/git-ents/git-vendor/compare/git-vendor-v0.1.1...git-vendor-v0.2.0) (2026-03-11) diff --git a/crates/git-vendor/Cargo.toml b/crates/git-vendor/Cargo.toml index 11e62df..674de06 100644 --- a/crates/git-vendor/Cargo.toml +++ b/crates/git-vendor/Cargo.toml @@ -4,7 +4,7 @@ rustdoc-args = ["--cfg", "docsrs"] [package] name = "git-vendor" -version = "0.2.0" +version = "1.0.0" description = "An in-source vendoring alternative to Git submodules and subtrees." repository = "https://github.com/git-ents/git-vendor" documentation = "https://docs.rs/git-vendor"