Eclipse Community Forums: EGit / JGit » Binary files differ: Cannot diff UTF16 files in GIT history

Home » Eclipse Projects » EGit / JGit » Binary files differ: Cannot diff UTF16 files in GIT history(Git history trouble with UTF16 encoded files)

Binary files differ: Cannot diff UTF16 files in GIT history [message #1703347]

Thu, 30 July 2015 17:42

Eclipse User

Cannot diff UTF16 files using EGit on Eclipse

.gitconfig

[user]
	name = srv-qaauto
	email = srv-qaauto@extremenetworks.com
[diff]
	tool = vimdiff
[difftool "vimdiff"]
	external = "vim -d"
	prompt = false
[diff "utf16strings"]
	textconv = C:\\Automation\\Local_Git_Repository\\SQA-ATG_Software_Automation\\utf16toascii.py

utf16toascii.py

#!/usr/bin/env python3
import sys
data = open(sys.argv[-1], 'rb').read()
ascii = data.decode('utf-16')
sys.stdout.write(ascii)

vim is installed on top of Cygwin. "vim -d" can be run from the commandline. Python3 is installed and in my path. It seems that EGit ignores the .gitconfig file.

How do I configure .gitconfig or EGit so I can compare the differences between git commits of UTF16 encoded files?

Thanks,
R

Re: Binary files differ: Cannot diff UTF16 files in GIT history [message #1703522 is a reply to message #1703347]

Sun, 02 August 2015 07:34

Eclipse User

Of course whit is not "ignoring .gitconfig". We are reading tons of parameters from it. But not all possible parameters are supported. And especially the parameters you mention are not supported. That the pure java component egit/jgit calls on Windows python scripts to generate content viewed/diffed in vim is quite far away from what egit is supporting nowadays. Sorry.

Previous Topic:	List conflicts prior to pull or merge
Next Topic:	Not Able to add new index file

Goto Forum:

-=] Back to Top [=-

Current Time: Sun Oct 26 21:00:42 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter