rebase: teach --autosquash to match on sha1 in addition to message
[git/kirr.git] / t / t3509-cherry-pick-merge-df.sh
bloba5ccdbf8fc22efb03891c6b5fa2c9715350a191f
1 #!/bin/sh
3 test_description='Test cherry-pick with directory/file conflicts'
4 . ./test-lib.sh
6 test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
7 mkdir a &&
8 >a/f &&
9 git add a &&
10 git commit -m a &&
12 mkdir b &&
13 ln -s ../a b/a &&
14 git add b &&
15 git commit -m b &&
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 &&
24 >f1 &&
25 git add f1 &&
26 git commit -m f1
29 test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' '
30 git reset --hard &&
31 git checkout master^0 &&
32 git cherry-pick branch
35 test_done