Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tree-merge follow-up #1651

Merged
merged 10 commits into from
Nov 5, 2024
Merged

tree-merge follow-up #1651

merged 10 commits into from
Nov 5, 2024

Commits on Nov 5, 2024

  1. remove a TODO that turned out to be unnecessary. 

    After all, stopping the merge when there is any conflict is highly relevant.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    5b428a9 View commit details
    Browse the repository at this point in the history

  2. feat: add Conflict::is_unresolved() as utility to see if multiple o… 

    …f them are considered unresolved.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    9e106c4 View commit details
    Browse the repository at this point in the history

  3. feat: add Object::peel_to_commit() to assure an object turns into a… 

    … commit.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    2fce14f View commit details
    Browse the repository at this point in the history

  4. feat: add Repository::index_or_load_from_head_or_empty(). 

    It's useful to get a reasonable index in any case, even on unborn repositories.
It's for cases where the `HEAD` isn't setup at all, despite content being available,
and to avoid unnecessary restrictions on what works.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    1f9556a View commit details
    Browse the repository at this point in the history

  5. feat: add objects::tree::Editor::detach() to get the underlying edi… 

    …tor back.

This can be useful to have more control over what gets written, or how.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    27b663e View commit details
    Browse the repository at this point in the history

  6. feat!: Repository::merge_trees() now has a fully-wrapped outcome. 

    That way, more attached types are used for greater convenience.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    1d2262f View commit details
    Browse the repository at this point in the history

  7. fix!: rename blob-merge feature to tree-merge. 

    By now, `blob-merge` is the lowest-level of features which is required
for both tree-merges and commit based merges. Hence it's better
to just call it `merge`.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    2547935 View commit details
    Browse the repository at this point in the history

  8. adapt to changes in gix

    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    589ee8e View commit details
    Browse the repository at this point in the history

  9. feat!: Repository::merge_trees() now takes portable version of `Opt… 

    …ions`.
    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    a43e563 View commit details
    Browse the repository at this point in the history

  10. adapt to changes in gix

    @Byron
    Byron committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    8d590f3 View commit details
    Browse the repository at this point in the history