[kdiff3] [Bug 434778] git difftool --dir-diff causes "Mix of links and normal files error".

[michael]

https://bugs.kde.org/show_bug.cgi?id=434778

michael <reeves...@gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|"Some files could not be    |git difftool --dir-diff
                   |processed."                 |causes "Mix of links and
                   |                            |normal files error".

--- Comment #3 from michael <reeves...@gmail.com> ---
The relevant code appears to be hear

if(!pOptions->m_bDmFollowFileLinks)
    {
        if(fi1.isSymLink() != fi2.isSymLink())
        {
            qCDebug(kdiffMain) << "Rejecting comparison of link to file.";
            status = i18n("Mix of links and normal files.");
            return bEqual;
        }
        else if(fi1.isSymLink() && fi2.isSymLink())
        {
            qCDebug(kdiffMain) << "Rejecting comparison of link to link. OK.";
            bError = false;
            bEqual = fi1.readLink() == fi2.readLink();
            status = i18n("Link: ");
            return bEqual;
        }
    }

This is inside MergeFileInfos::fastFileComparison which is only called when
Full Analysis is turned on. I'm going to be adding an option to disable this
message which was not passed on to the caller before 1.8.
This situation is created by git which internally symlinks the files in the
current worktree and compares them to real files from the previous commit.

-- 
You are receiving this mail because:
You are watching all bug changes.