aboutsummaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-15 23:25:22 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-04 00:25:10 -0700
commitc81935348be263de3da085e6ac828b583a85c905 (patch)
tree0cba3a90230a1df1f01f6c0a4b32f66e92477321 /read-cache.c
parentb8ba1535bda7bd553f46ea57bdbcee1c90e500a0 (diff)
downloadgit-c81935348be263de3da085e6ac828b583a85c905.tar.gz
git-c81935348be263de3da085e6ac828b583a85c905.tar.xz
Fix switching to a branch with D/F when current branch has file D.
This loosens the over-eager verify_absent() check that gets upset to find directory D in the current working tree when switching to a branch that has a file there. The check needs to make sure that we do not lose precious working tree files as a result of removing directory D and replacing it with the file from the other branch, which is a tad expensive but this is a less common case. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions