diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-15 23:25:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-04 00:25:10 -0700 |
| commit | c81935348be263de3da085e6ac828b583a85c905 (patch) | |
| tree | 0cba3a90230a1df1f01f6c0a4b32f66e92477321 /archive-tar.c | |
| parent | Fix twoway_merge that passed d/f conflict marker to merged_entry(). (diff) | |
| download | tgif-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 'archive-tar.c')
0 files changed, 0 insertions, 0 deletions