3 # Copyright (c) 2008 Johannes E. Schindelin
6 test_description
='symlink/directory conflict'
10 test_expect_success
'setup' '
12 mkdir -p alpha/beta/gamma &&
13 ln -s delta alpha/beta/gamma/epsilon &&
14 mkdir -p alpha/beta/theta &&
15 ln -s zeta alpha/beta/theta/eta &&
16 mkdir -p iota/kappa/lambda/ &&
17 : > iota/kappa/lambda/mu &&
20 git commit -m initial &&
22 git rm -r alpha/beta/gamma &&
23 ln -s nu alpha/beta/gamma &&
24 git rm -r alpha/beta/theta &&
25 ln -s xi alpha/beta/theta &&
32 test_expect_failure
'read-tree -u -m handles symlinks gracefully' '
34 git checkout -b side HEAD^ &&
35 git read-tree -u -m master