Update to forced checkout and untracked files #4260
Conversation
|
Hrmf, looks like I did something stupid here. 馃憖 |
|
I cannot investigate right now, got no Windows VM handy -- I could do so next week, probably, if you've not gotten around to do it by then. By the way -- feel free to drop the commit containing my previous solution. |
ethomson
force-pushed
the
ethomson/forced_checkout_2
branch
from
a46e619
to
4f43d0c
Compare
If the `GIT_CHECKOUT_FORCE` flag is given to any of the `git_checkout` invocations, we remove files which were previously staged. But while doing so, we unfortunately also remove unstaged files in a directory which contains at least one staged file, resulting in potential data loss. This commit adds two tests to verify behavior.
When deleting a directory during checkout, do not simply delete the directory, since there may be untracked files. Instead, go into the iterator and examine each file. In the original code (the code with the faulty assumption), we look to see if there's an index entry beneath the directory that we want to remove. Eg, it looks to see if we have a workdir entry foo and an index entry foo/bar.txt. If this is not the case, then the working directory must have precious files in that directory. This part is okay. The part that's not okay is if there is an index entry foo/bar.txt. It just blows away the whole damned directory. That's not cool. Instead, by simply pushing the directory itself onto the stack and iterating each entry, we will deal with the files one by one - whether they're in the index (and can be force removed) or not (and are precious). The original code was a bad optimization, assuming that we didn't need to git_iterator_advance_into if there was any index entry in the folder. That's wrong - we could have optimized this iff all folder entries are in the index. Instead, we need to simply dig into the directory and analyze its entries.
Only ignore `EBUSY` from `rmdir` when the `GIT_RMDIR_SKIP_NONEMPTY` bit is set.
ethomson
force-pushed
the
ethomson/forced_checkout_2
branch
from
4f43d0c
to
4a0df57
Compare
|
Previous to this change, we would try to seize the opportunity to efficiently remove directories when we thought that we wanted to remove all of the files inside them. But we could not effectively do that, and risked data loss. This removes that optimization, and makes us process the items inside the directory. By moving the directory deletion into standard call path, we clean up directories that are made newly empty (as a result of deleting the files inside them). This change illustrated another failure: the option So the last commit teaches the Callers on Windows should probably be using |
A riff on #4129, with the changes discussed therein. Opening a new PR to make sure that CI is happy before I merge it. 馃槃