UTF-16 encoding don't merge when conflict

[xiaofuhub]

You are opening a bug report against the libgit2 project: we use
GitHub Issues for tracking bug reports and feature requests. If you
have a question about an API or usage, please ask on StackOverflow:
http://stackoverflow.com/questions/tagged/libgit2. If you want to
have high-level discussions about the libgit2 project itself, visit
https://github.com/libgit2/discussions.

Otherwise, to report a bug, please fill out the reproduction steps
(below) and delete these introductory paragraphs. Thanks!

Reproduction steps

Expected behavior

Actual behavior

Version of libgit2 (release number or SHA1)

Operating system(s) tested

[xiaofuhub]

I'm tracking a file (*.sra) in libgit2, and after making a change libgit2 identified the file as binary and wouldn't diff it for me. I discovered that the file was encoded in UTF-16.

Can libgit2 be taught to recognize that this file is text and handle it appropriately?

I'm using git, it can set 'working-tree-encoding' attribute to merge it,when conflict .

[ethomson]

Going to leave this open for tracking; we want to support working-tree-encoding.

[thuibr]

Hello, I would like to +1 this issue. TortoiseGit uses libgit2. See https://groups.google.com/g/tortoisegit-users/c/rAu2WiA5YBs for further information.

[anatoly-spb]

+1 https://gitlab.com/tortoisegit/tortoisegit/-/issues/3749