search

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows
461 stars 10 forks source link

External Diff not working if filename is the same #1709

Open Grootent opened 1 year ago

Grootent commented 1 year ago

I'm using git with LabVIEW which is a graphical programming language, so to diff the files I need an external diff program, which in this case is LVCompare.exe so I've tried to set-up the external tool like this:

"C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" "$LOCAL" "$REMOTE"

But this didn't work, and I started debugging this. So this is what Fork is actually sending to my diff tool:

"C:\Company\project\source\Project Tree.vi" "C:\Users\Company\AppData\Local\Temp2\Fork\staged\Project Tree.vi"

The LabVIEW compare functions doesn't like that the filename is the same.(path is for LVCompare not part of the filename) This can be resolved by changing the filename like this p.e.

"C:\Company\project\source\Project Tree.vi" "C:\Users\Company\AppData\Local\Temp\Project Tree~remote.vi"

It use to work since issue #621 was fixed, but I do not know at which point the change of the filename is removed.

I hope you can fix this, because this makes working with the external diff tool useless.

Grootent commented 1 year ago

Hi Anthony,

Thanks for the reply.

It is not the fault of the external diff tool. but this is related to the LabVIEW development environment, which does not allow two filenames with the same name. In TortoiseGIT it works well.

Is it possible that we, as the LabVIEW community, can maintain this work for Fork?

Regards Fred Grootentraast Certified LabVIEW Architect

Op di 22 nov. 2022 om 18:17 schreef Anthony Marmont < @.***>:

This seems like the fault of the external diffing tool rather than Git Fork; however there are modifications that can be made to Git Fork to behave like other some Git clients that do rename files (such as TortoiseSVN).

Mercurial SCM has this same "issue" where it launches the diffing tool on files which are located in different directory but have the same file name.

This would have to be optional to maintain the current behaviour for the majority of use-cases.

— Reply to this email directly, view it on GitHub https://github.com/fork-dev/TrackerWin/issues/1709#issuecomment-1324004772, or unsubscribe https://github.com/notifications/unsubscribe-auth/AESQ22LBCA55IOCST63BZ6DWJT5ZDANCNFSM6AAAAAASH5XEKM . You are receiving this because you authored the thread.Message ID: @.***>