{"thread":{"id":"49920","subject":"git difftool directory diff problem copying changes back is not reliable","startedAt":"2018-11-30T13:21:49Z","lastAt":"2018-11-30T13:21:49Z","messageCount":1,"participants":["Uwe Hafner"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"364394","messageId":"007501d488af$a5dac7e0$f19057a0$@gmx.de","threadId":"49920","inReplyTo":null,"subject":"git difftool directory diff problem copying changes back is not reliable","fromName":"Uwe Hafner","fromEmail":"u.hafner@gmx.de","sentAt":"2018-11-30T13:21:47Z","receivedAt":"2018-11-30T13:21:49Z","isPatch":false,"sender":{"key":"u.hafner@gmx.de","avatar":null},"body":"I have a problem with directory diff. The following command:\n\nGit difftool -d _commit_sha_\n\nOpens my compare tool (Beyondcompare) and I can make a folder diff. The tool\nalso allows browsing through all changes and looking/editing single files (a\nbeyondcompare feature).\nSo my workflow would be to open single files and make changes to the right\nside of the diff.\n\nAfter saving and exiting the diff tool sometimes these changes are copied\nback to my working tree.\n \nI currently assume from my tests that changes are copied to the working tree\nif they are not too deeply nested in folders. So changes to files in folders\nup to a depth of about 4 or so are copied back. If any deeper they are not.\n\nMy system specs:\nOS: Windows 10\nGit: 2.19.2.windows.1\n\nFolder of repo. Folder name length is identical to real folder name length\nin case it is a folder name length issue: \nC:\\Users\\Developer\\source\\repos\\Project_name_length_\n\nFolder for comparison (temp names are really used names):\nCommit sha side:\nC:\\Users\\Developer\\AppData\\Local\\Temp\\git-difftool.a07928\\left\nWorking tree copy side:\nC:\\Users\\Developer\\AppData\\Local\\Temp\\git-difftool.a07928\\right\n\nCan anyone confirm this?\nThanks\n\n"}]}