]>
Commit | Line | Data |
---|---|---|
f433f705 AG |
1 | #!/bin/sh |
2 | ||
3 | test_description='Test cherry-pick with directory/file conflicts' | |
4 | . ./test-lib.sh | |
5 | ||
dd568581 | 6 | test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' ' |
f433f705 AG |
7 | mkdir a && |
8 | >a/f && | |
9 | git add a && | |
10 | git commit -m a && | |
11 | ||
12 | mkdir b && | |
13 | ln -s ../a b/a && | |
14 | git add b && | |
15 | git commit -m b && | |
16 | ||
17 | git checkout -b branch && | |
18 | rm b/a && | |
19 | mv a b/a && | |
20 | ln -s b/a a && | |
21 | git add . && | |
22 | git commit -m swap && | |
23 | ||
24 | >f1 && | |
25 | git add f1 && | |
26 | git commit -m f1 | |
27 | ' | |
28 | ||
dd568581 | 29 | test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' ' |
f433f705 AG |
30 | git reset --hard && |
31 | git checkout master^0 && | |
32 | git cherry-pick branch | |
33 | ' | |
34 | ||
35 | test_done |