yousseb / meld

Meld for macOS
https://yousseb.github.io/meld/
GNU General Public License v2.0
2.28k stars 119 forks source link

Links are displayed in confusing manner #98

Open tomaszmrugalski opened 4 years ago

tomaszmrugalski commented 4 years ago

hi there!

First of all, thanks a lot for packaging meld for macOS. Meld is a great tool and it's fantastic to be able to use on mac.

I wanted to report an issue that bothered me a lot, until I finally figured out what is wrong. Basically, it displays the links incorrectly. When I did compare two branches (using git difftool -d master...mybranch), the right panel was showing filenames followed by a directory name. As a result, the whole right panel was incredibly stretched and very hard to compare.

I suppose the original intention was to display @ sign, but it was showing a garbled unicode there. It took me a while before I figured out that links are the problem.

Here's a screenshot.

meld

Meld version: 3.19.2.osx6 (from brew), but also tried 3.19.2-r5 and 3.21.0-r1. MacOS version: 10.14.6 (but the problem manifested itself on several earlier versions)

Ideally, there should be an option to treat links as normal files. Yes, there's preferences -> Folder comparisons -> Ignore symbolic links, but it didn't change anything.

At the very least, a proper @ sign should be displayed instead of the unicode.

tomaszmrugalski commented 4 years ago

Found workaround for this problem. Added

[core]
        symlinks = false

to my ~/.gitconfig file. This, however, makes git always copy the whole tree when comparing. This may be slow on larger projects.