8000 submodule: git_index_add_bypath does not move conflict entries to REUC for submodules · Issue #6963 · libgit2/libgit2 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
submodule: git_index_add_bypath does not move conflict entries to REUC for submodules #6963
Open
@lrm29

Description

@lrm29

Because of the early return after git_submodule_add_to_index here, index_conflict_to_reuc is not called when the path is a submodule.

I can workaround this by calling git_index_conflict_remove after I call git_index_add_bypath.

I propose that git_submodule_add_to_index should call index_conflict_to_reuc (or something like it), as it is part of the API and should also handle conflicts correctly?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions

      0