Bug Fixes
- assure that blob merges recognize conflicts in cojunction with empty bases.
Previously, there were special cases that would cause it to auto-merge conflicts
even though it shouldn't.
This is now fixed just by removing the special case entirely, which seems
unexpected in any of the test-suite. - run merge-filters in the worktree dir or the git dir.
That way, we emulate what Git actually does as it will set the CWD
of the process to either of these.
Commit Statistics
- 15 commits contributed to the release over the course of 99 calendar days.
- 99 days passed between releases.
- 2 commits were understood as conventional.
- 0 issues like '(#ID)' were seen in commit messages
Commit Details
view details
- Uncategorized
- Release gix-date v0.10.6, gix-utils v0.3.1, gix-actor v0.35.5, gix-trace v0.1.14, gix-validate v0.10.1, gix-path v0.10.21, gix-features v0.44.0, gix-hash v0.20.0, gix-hashtable v0.10.0, gix-object v0.51.0, gix-glob v0.22.0, gix-quote v0.6.1, gix-attributes v0.28.0, gix-command v0.6.3, gix-packetline-blocking v0.19.2, gix-filter v0.21.0, gix-fs v0.17.0, gix-chunk v0.4.12, gix-commitgraph v0.30.0, gix-revwalk v0.22.0, gix-traverse v0.48.0, gix-worktree-stream v0.23.0, gix-archive v0.23.0, gix-bitmap v0.2.15, gix-tempfile v19.0.0, gix-lock v19.0.0, gix-index v0.42.0, gix-config-value v0.15.2, gix-pathspec v0.13.0, gix-ignore v0.17.0, gix-worktree v0.43.0, gix-diff v0.54.0, gix-blame v0.4.0, gix-ref v0.54.0, gix-sec v0.12.1, gix-config v0.47.0, gix-prompt v0.11.2, gix-url v0.33.0, gix-credentials v0.31.0, gix-discover v0.42.0, gix-dir v0.16.0, gix-mailmap v0.27.3, gix-revision v0.36.0, gix-merge v0.7.0, gix-negotiate v0.22.0, gix-pack v0.61.0, gix-odb v0.71.0, gix-refspec v0.32.0, gix-shallow v0.6.0, gix-packetline v0.19.2, gix-transport v0.49.0, gix-protocol v0.52.0, gix-status v0.21.0, gix-submodule v0.21.0, gix-worktree-state v0.21.0, gix v0.74.0, gix-fsck v0.13.0, gitoxide-core v0.49.0, gitoxide v0.46.0, safety bump 42 crates (89fb308)
- Merge pull request #2217 from GitoxideLabs/copilot/update-msrv-to-rust-1-82 (4da2927)
- Fixup Copilot commits and thank clippy (b188a7d)
- Update MSRV to 1.82 and replace once_cell with std equivalents (6cc8464)
- Merge pull request #2207 from GitoxideLabs/improvements (fcb4448)
- Assure that blob merges recognize conflicts in cojunction with empty bases. (a929e9c)
- Merge pull request #2203 from GitoxideLabs/improvements (c295db0)
- Run merge-filters in the worktree dir or the git dir. (5761441)
- Merge pull request #2202 from GitoxideLabs/dependabot/cargo/cargo-4a7155215a (9365cc3)
- Bump the cargo group across 1 directory with 64 updates (838ff95)
- Merge pull request #2113 from GitoxideLabs/release (dc7343c)
- Release gix-actor v0.35.4, gix-fs v0.16.1, gix-object v0.50.2, gix-ref v0.53.1 (79ba9d0)
- Merge pull request #2100 from GitoxideLabs/release (202bc6d)
- Release gix-actor v0.35.3, gix-path v0.10.20, gix-features v0.43.1, gix-object v0.50.1 (d64f257)
- Merge pull request #2075 from GitoxideLabs/improvements (784c046)