tree cf4636b1dedf52ac77749a71b95d5b6df60fbae8
parent 14242464811bff9e8d1af8eb33367a01480a18d0
author Junio C Hamano <junkio@cox.net> 1115856165 -0700
committer Petr Baudis <xpasky@machine.sinus.cz> 1115926587 +0200

[PATCH] checkout-cache fix

Fix checkout-cache when existing work tree interferes with the checkout.

This is essentially the same one as the last one I sent to the
GIT list, except that the patch is rebased to the current tip of
the git-pb tree, and an unnecessary call to create_directories()
removed.

The checkout-cache command gets confused when checking out a
file in a subdirectory and the work tree has a symlink to the
subdirectory.  Also it fails to check things out when there is a
non-directory in the work tree when cache expects a directory
there, and vice versa.  This patch fixes the first problem by
making sure all the leading paths in the file being checked out
are indeed directories, and also fixes directory vs
non-directory conflicts when '-f' is specified by removing the
offending paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>