weird results git dir-diff option

[CircleCode]

when used through

Code: Select all

git difftool --dir-diff

git does create symlinks for the files to be compared, then diffmerge no more compare them…

[CircleCode]

I know that git provides the --no-symlink option, but for a big repo, this can be a problem

and this option was finely supported in older diffmerge versions…

[Beth]

Do you have the configuration variable difftool.<tool>.path set?

The information I'm referencing on using the Git difftool comes from this page: https://www.kernel.org/pub/software/scm ... ftool.html

[CircleCode]

Hi,

Difftool configuration is OK, and it works like a charm. The problem is that when used with the dir-diff option, git create symlinks of files to be compared, and it seems diffmerge consider that it should not compare symlinks, even if they share the same name...

[jeffhostetler]

Yeah, you're right. When I added code to treat symlinks
as first class citizens in the tree (and therefore let you see
that a pair of symlinks have the same/different target), I
broke the previous ability to have a file on one side and a
symlink on the other (either pointing back to the first or to
some other file) and compare the 2 files (or in your case
effectively the file with itself).

I'll log this.

[CircleCode]

What do you mean by

I'll log this.

Does this mean you log it in your bug-tracker, or log it in release notes ?

[jeffhostetler]

Sorry for the confusion.
I've logged a bug for this.

[CircleCode]

Sorry for the confusion.

It's Ok, I suspected this was what you said, but just wanted to be sure

Thanks for the feedback, and the bug opening

[axlrosen]

Hi, any progress on this bug? It's unfortunately a real blocker for me for using DiffMerge with git.

[Beth]

Unfortunately this hasn't been completed as of this date. I can see we have the bug logged. I will bump it up in priority.


V: W3981

[CircleCode]

Hi, any progress on this bug? It's unfortunately a real blocker for me for using DiffMerge with git.

axlrosen: until this bug is fixed, I use

Code: Select all

git difftool --dir-diff --no-symlink

and it works, even if it is not the better way to do this.