Setup 'git diff' for special file types

Question

I want to manage Excel files in one of my repositories. Diffing them is a problem (they are binary files). However, there is a nice tool for diffing them: https://github.com/na-ka-na/ExcelCompare

I wanted to set it up using .gitattributes

*.xls diff=excel
*.xlsx diff=excel

And in the .git/config:

[diff "excel"]
    textconv = excel_cmp.bat

The command excel_cmp.bat file1.xls file2.xls works very well. However, the setup I use above seems to try to convert the excel files to text using excel_cmp.bat and then diffs the text output.

How do I setup the diff tool to diff two files - and not to convert to text first and then diff the text output?

EDIT:

In the above setting, what git seems to do is to diff the output of excel_cmp.bat <file1> and excel_cmp.bat <file2>. But what I want is excel_cmp.bat <file1> <file2>. How can I set this up?

Does the diff tool do that regardless of whether you use it in git ot not? Perhaps you should contact the asuthor on github. — doctorlove
– doctorlove, Commented Nov 19, 2013 at 11:17
In my current setting, the difftool is called by git with just one parameter. It expects two. — Sh4pe
– Sh4pe, Commented Nov 19, 2013 at 12:21

Sh4pe · Accepted Answer · 2013-11-19 13:19:03Z

6

Okay, what I was looking for was the following in my .gitconfig:

[diff "excel"]
    command = excel_cmp.bat

answered Nov 19, 2013 at 13:19

Sh4pe

1,8861 gold badge16 silver badges31 bronze badges

Sign up to request clarification or add additional context in comments.

1 Comment

Jonathan Hill Over a year ago

Where did you place the excel_cmp.bat file?

Bjoern Stiel · Accepted Answer · 2018-02-19 11:09:49Z

0

We've built an open-source Git command line extension for Excel workbooks: https://www.xltrail.com/git-xltrail (the repository is hosted on GitHub: https://github.com/ZoomerAnalytics/git-xltrail) which might help you. It's a simple installation process and does not require any manual plumbing work.

In a nutshell, the main feature is that it makes git diff work on any workbook file formats so that it shows the diff on the workbook's VBA content (at some point, we'll make this work for the worksheets content, too).

answered Feb 19, 2018 at 11:09

Bjoern Stiel

4,1911 gold badge25 silver badges20 bronze badges

1 Comment

Mathieu J. Over a year ago

Support for Linux/LibreOffice?

Collectives™ on Stack Overflow

Setup 'git diff' for special file types

2 Answers 2

1 Comment

1 Comment

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

1 Comment

1 Comment

Your Answer

Sign up or log in

Post as a guest

Linked

Related