Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump gix from 0.67.0 to 0.68.0 (#1765)
Bumps [gix](https://github.com/GitoxideLabs/gitoxide) from 0.67.0 to 0.68.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/GitoxideLabs/gitoxide/releases">gix's releases</a>.</em></p> <blockquote> <h2>gix v0.68.0</h2> <h3>New Features</h3> <ul> <li> <p>Add support for <code>index</code> application in merge results via <code>merge::tree::Outcome::index_changed_after_applying_conflicts()</code></p> </li> <li> <p>add <code>Repository::merge_base_octopus()</code></p> </li> <li> <p>add <code>Repository::virtual_merge_base()</code> and <code>Repository::virtual_merge_base_with_graph()</code>.</p> </li> <li> <p>add <code>Repository::merge_commits()</code> It's often more convenient to work with commits when merging, especially when merge-bases are dealt with automatically.</p> </li> <li> <p>add <code>objects::tree::Editor::detach()</code> to get the underlying editor back. This can be useful to have more control over what gets written, or how.</p> </li> <li> <p>add <code>Repository::index_or_load_from_head_or_empty()</code>. It's useful to get a reasonable index in any case, even on unborn repositories. It's for cases where the <code>HEAD</code> isn't setup at all, despite content being available, and to avoid unnecessary restrictions on what works.</p> </li> <li> <p>add <code>Object::peel_to_commit()</code> to assure an object turns into a commit.</p> </li> <li> <p>add <code>Repository::merge_trees()</code></p> </li> <li> <p><code>gix::Repository</code> implements all traits for object reading and writing. That way it becomes usable when merging trees, which benefits from automatic checking of hashes before writing loose objects.</p> </li> <li> <p>add <code>tree()</code> and <code>commit()</code> merge support, en par with <code>merge-ORT</code> as far as tests go. Note that this judgement of quality is based on a limited amount of partially complex test, but it's likely that in practice there will be deviations of sorts.</p> <p>Also, given the complexity of the implementation it is definitely under-tested, but with that it's mostly en par with Git, unfortunatly.</p> <p>On the bright side, some of the tests are very taxing and I'd hope this means something for real-world quality.</p> </li> </ul> <h3>Bug Fixes</h3> <ul> <li> <p><code>Repository::tree_merge_options()</code> now comes with rewrite tracking. This is the way Git acts, as it's either configured, or defaults to the value coming from the <code>diff.renames</code> configuration.</p> </li> <li> <p>respect <code>core.bare=true</code> in conjunction with the main worktree</p> </li> <li> <p>propagate errors that are triggered when writing objects Previously it was assumed that writing objects could never fail unless there isn't enough memory to do so. However, it turns out that some last-minute validation can always be triggered and prevent an object to be written.</p> <p>Now that error is propagated instead.</p> </li> <li> <p>assure submodules are skipped everywhere This also adds <code>Repository::head_tree()</code> for convenience.</p> </li> </ul> <h3>New Features (BREAKING)</h3> <ul> <li><code>Repository::merge_trees()</code> now takes portable version of <code>Options</code>.</li> <li><code>Repository::merge_trees()</code> now has a fully-wrapped outcome.</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/4000197ecc8cf1a5d79361620e4c114f86476703"><code>4000197</code></a> Release gix-glob v0.17.1, gix-command v0.3.11, gix-filter v0.15.0, gix-chunk ...</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/9d627bbc27322285e8d2ac3c5135ce425ad76838"><code>9d627bb</code></a> prepare changelogs once more</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/4145d2a4c385931731e69c793864ec9b4fd4b87f"><code>4145d2a</code></a> fix gix-path version (which fails publishing due to the patch-level mismatch)</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/8ce49129a75e21346ceedf7d5f87fa3a34b024e1"><code>8ce4912</code></a> Release gix-date v0.9.2, gix-actor v0.33.1, gix-hash v0.15.1, gix-features v0...</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/bc9d9943e8499a76fc47a05b63ac5c684187d1ae"><code>bc9d994</code></a> prepare changelogs prior to release</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/54ea266a5b57d3081c2ba6ed60dc0612059617ca"><code>54ea266</code></a> Merge pull request <a href="https://redirect.github.com/GitoxideLabs/gitoxide/issues/1700">#1700</a> from GitoxideLabs/reduce-memory</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/664e28caa4304fe489d2b37a1a3328763960517f"><code>664e28c</code></a> try to reduce memory consumption by avoiding over-capacity of possibly large ...</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/0b7abfbdebe8c5ab30b89499a70dd7727de41184"><code>0b7abfb</code></a> Merge pull request <a href="https://redirect.github.com/GitoxideLabs/gitoxide/issues/1661">#1661</a> from GitoxideLabs/merge</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/71b0ceaf02e022e83e6c24cfd0bdc26299dc95a0"><code>71b0cea</code></a> feat: Add support for <code>index</code> application in merge results via `merge::tree::...</li> <li><a href="https://github.com/GitoxideLabs/gitoxide/commit/3ee8b62dd025d6fdb0d9929dec7a561fa576f545"><code>3ee8b62</code></a> feat: provide a way to record and apply index changes.</li> <li>Additional commits viewable in <a href="https://github.com/GitoxideLabs/gitoxide/compare/gix-v0.67.0...gix-v0.68.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=gix&package-manager=cargo&previous-version=0.67.0&new-version=0.68.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
- Loading branch information