git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git difftool directory diff problem copying changes back is not reliable

From
UHUwe Hafner <u.hafner@gmx.de>
Date
Nov 30, 2018, 13:21 UTC
Message-ID
<007501d488af$a5dac7e0$f19057a0$@gmx.de>
I have a problem with directory diff. The following command:
Git difftool -d _commit_sha_

Opens my compare tool (Beyondcompare) and I can make a folder diff. The tool also allows browsing through all changes and looking/editing single files (a beyondcompare feature). So my workflow would be to open single files and make changes to the right side of the diff.

After saving and exiting the diff tool sometimes these changes are copied
back to my working tree.
 
I currently assume from my tests that changes are copied to the working tree
if they are not too deeply nested in folders. So changes to files in folders
up to a depth of about 4 or so are copied back. If any deeper they are not.
My system specs:
OS: Windows 10
Git: 2.19.2.windows.1

Folder of repo. Folder name length is identical to real folder name length in case it is a folder name length issue: C:\Users\Developer\source\repos\Project_name_length_

Folder for comparison (temp names are really used names): Commit sha side: C:\Users\Developer\AppData\Local\Temp\git-difftool.a07928\left Working tree copy side: C:\Users\Developer\AppData\Local\Temp\git-difftool.a07928\right

Can anyone confirm this? Thanks

Message 1 of 1 in “git difftool directory diff problem copying changes back is not reliable”
  1. Uwe HafnerNov 30, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.