Skip to content

git-imerge continue fails with "Commit <SHA> is not usable; it is an octopus merge" when log.showSignature is set in config #141

@cscutcher

Description

@cscutcher

Casual investigation suggests that this is because get_commit_parents runs git log and is not expecting to see the signature in the output.

Unfortunately there doesn't seem to be an inverse of --show-signature and specifying --pretty doesn't seem to prevent the sig showing up in the output of git log. Perhaps imerge could disable this option in local config for the duration of the imerge? or use a more sophisticated way to query parents?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions