Alternative diff algorithm for special file extension for Git

Question

I want to use an alternative diff algorithm for special file extension, e.g. ".java" and the standart diff algorithm for other files.

I can make it via .gitattributes file:

*.java diff=javadiffprogramm

and .gitconfig file:

[diff "javadiffprogramm"]
    command = pathToDiffProgram.

My question is what is the format of input parameters of "javadiffprogramm" and where it should output the result of diff? The result of diff has the format like "@@ -1,7 +1,6 @@...".

Some questions on this topic:

Community · Accepted Answer · 2020-06-20 09:12:55Z

3

This is documented in the git man page as GIT_EXTERNAL_DIFF.

GIT_EXTERNAL_DIFF

When the environment variable GIT_EXTERNAL_DIFF is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, GIT_EXTERNAL_DIFF is called with 7 parameters:
path old-file old-hex old-mode new-file new-hex new-mode

The docs go on to explain what those parameters are.

Output should be to STDOUT.

edited Jun 20, 2020 at 9:12

CommunityBot

11 silver badge

answered Feb 24, 2016 at 16:32

Schwern

167k28 gold badges225 silver badges370 bronze badges

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

2 Comments

NAlmaz Over a year ago

Thanks a lot! I have found about 7 input parameters, but nothing about Output. Maybe I wasn't attentive.

Schwern Over a year ago

@NAlmaz I couldn't find information about output either. It's an educated guess based on how Unix tools generally work. If Git wants the output written elsewhere it can redirect it itself.

Collectives™ on Stack Overflow

Alternative diff algorithm for special file extension for Git

1 Answer 1

2 Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

2 Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related