undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout -f: do not leave untracked working tree files.

Browse Source 
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".

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-06-20 02:47:14 -07:00
parent 5b276ee4fb
commit 4170af8232
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-checkout.sh
View File

@ -137,8 +137,7 @@ fi
if [ "$force" ] if [ "$force" ]
then then
git-read-tree --reset $new && git-read-tree --reset -u $new
git-checkout-index -q -f -u -a
else else
git-update-index --refresh >/dev/null git-update-index --refresh >/dev/null
merge_error=$(git-read-tree -m -u $old $new 2>&1) || ( merge_error=$(git-read-tree -m -u $old $new 2>&1) || (