Re: [PATCH] checkout -f: do not leave untracked working tree files.
- From
- Santi Béjar <sbejar@gmail.com>
- Date
- Jun 20, 2006, 11:01 UTC
- Message-ID
- <8764iw5bvl.fsf@gmail.com>
- In-Reply-To
- <7vfyi0b1gv.fsf_-_@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
Show 18 quoted lines
> Earlier we did not consider untracked working tree files > "precious", but we have always considered them fair game to > clobber. These days, branch switching by read-tree is more > careful and tries to protect untracked working tree files. This > caused the following workflow to stop working: > > git checkout one-branch-with-file-F > git checkout -f another-without-file-F > git pull . one-branch-with-file-F > > Because the second checkout leaves F from the previous state as > untracked file in the working tree, the merge would fail, trying > to protect F from being clobbered. > > This changes "git checkout -f" to remove working tree files that > are known to git in the switched-from state but do not exist in > the switched-to state, borrowing the same logic from "reset --hard". >
I agree with this patch (without testing).
Another thing to take into account is that, for this particular case/sequence, the untracked file-F is exactly the same as the one from the pull, so you are not overwritting that file and it could succeed.
Santi