3 Commits

Include renames

Author	SHA1	Message	Date
Stefan HallerandJesse Duffield	b256215397	Say "discard" instead of "remove" when discard changes from a commit ... "Remove" can be confusing when a deleted file is selected; in this cases it actually "un-removes" it. "Discard" hopefully makes it clearer that we are talking about the change to a file, and not the file itself.	2026-03-07 20:47:19 +11:00
Stefan Haller	c1e52fc807	Fix dropping submodule changes from a commit ... Our logic to decide if a file needs to be checked out from the previous commit or deleted because it didn't exist in the previous commit didn't work for submodules. We were using `git cat-file -e` to ask whether the file existed, but this returns an error for submodules, so we were always deleting those instead of reverting them back to their previous state. Switch to using `git ls-tree -- file` instead, which works for both files and submodules.	2025-10-10 12:55:58 +02:00
Stefan Haller	0904bf9969	Add test demonstrating the problem ... When dropping changes to the submodule, we expect it to get rolled back to the previous version; however, it is removed entirely instead.	2025-10-10 12:55:58 +02:00