3 test_description
='Test cherry-pick continuation features
5 + anotherpick: rewrites foo to d
6 + picked: rewrites foo to c
7 + unrelatedpick: rewrites unrelated to reallyunrelated
8 + base: rewrites foo to b
9 + initial: writes foo as a, unrelated as unrelated
16 rm -rf .git
/sequencer
&&
17 git checkout
-f "$1^0" &&
18 git read-tree
-u --reset HEAD
&&
19 git clean
-d -f -f -q -x
22 test_expect_success setup
'
23 echo unrelated >unrelated &&
25 test_commit initial foo a &&
26 test_commit base foo b &&
27 test_commit unrelatedpick unrelated reallyunrelated &&
28 test_commit picked foo c &&
29 test_commit anotherpick foo d &&
30 git config advice.detachedhead false
34 test_expect_success
'cherry-pick persists data on failure' '
35 pristine_detach initial &&
36 test_must_fail git cherry-pick base..anotherpick &&
37 test_path_is_dir .git/sequencer &&
38 test_path_is_file .git/sequencer/head &&
39 test_path_is_file .git/sequencer/todo
42 test_expect_success
'cherry-pick cleans up sequencer state upon success' '
43 pristine_detach initial &&
44 git cherry-pick initial..picked &&
45 test_path_is_missing .git/sequencer