Conflicts in .gitmodules not visible

[Murmele]

If there is a conflict only in a .gitmodules, Gittyup does not show anything. But with git status it is visible

[Murmele]

GittyupTestHiddenFileConflict.zip

Check git status and in the gui

[Murmele]

The problem is that git_diff_index_to_workdir returns an error: Last error: failed to parse config file: invalid configuration key (in Repo/.gitmodules:3
Seems that libgit2 is not capable of handling merge conflicts in .gitmodules

[submodule "GittyupTestHiddenFileConflictSubmodule"]
	path = GittyupTestHiddenFileConflictSubmodule
<<<<<<< HEAD
	url = ../GittyupTestHiddenFileConflictSubmodule3
=======
	url = ../GittyupTestHiddenFileConflictSubmodule2
>>>>>>> master

[AHSauge]

Nice corner case you've got there. Is there an upstream issue on this? Plain libgit2 also fails, or at the very least the git status example does.

[Murmele]

I didn't check libgit2 if there exists an issue. Perhabs I did not document where I have seen that libgit2 does not support

[AHSauge]

I doubt it's intentional. The code seems to anticipate this situation, but not implement a fallback / handling of it. I'll write an issue and see what can be done about this.

[AHSauge]

libgit2/libgit2#7191

[Murmele]

Thanks for creating this really informative issue!