#!/bin/sh test_description='Test cherry-pick continuation features + anotherpick: rewrites foo to d + picked: rewrites foo to c + unrelatedpick: rewrites unrelated to reallyunrelated + base: rewrites foo to b + initial: writes foo as a, unrelated as unrelated ' . ./test-lib.sh pristine_detach () { rm -rf .git/sequencer && git checkout -f "$1^0" && git read-tree -u --reset HEAD && git clean -d -f -f -q -x } test_expect_success setup ' echo unrelated >unrelated && git add unrelated && test_commit initial foo a && test_commit base foo b && test_commit unrelatedpick unrelated reallyunrelated && test_commit picked foo c && test_commit anotherpick foo d && git config advice.detachedhead false ' test_expect_success 'cherry-pick persists data on failure' ' pristine_detach initial && test_must_fail git cherry-pick -s base..anotherpick && test_path_is_dir .git/sequencer && test_path_is_file .git/sequencer/head && test_path_is_file .git/sequencer/todo && test_path_is_file .git/sequencer/opts ' test_expect_success 'cherry-pick persists opts correctly' ' pristine_detach initial && test_must_fail git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick && test_path_is_dir .git/sequencer && test_path_is_file .git/sequencer/head && test_path_is_file .git/sequencer/todo && test_path_is_file .git/sequencer/opts && echo "true" >expect && git config --file=.git/sequencer/opts --get-all options.signoff >actual && test_cmp expect actual && echo "1" >expect && git config --file=.git/sequencer/opts --get-all options.mainline >actual && test_cmp expect actual && echo "recursive" >expect && git config --file=.git/sequencer/opts --get-all options.strategy >actual && test_cmp expect actual && cat >expect <<-\EOF && patience ours EOF git config --file=.git/sequencer/opts --get-all options.strategy-option >actual && test_cmp expect actual ' test_expect_success 'cherry-pick cleans up sequencer state upon success' ' pristine_detach initial && git cherry-pick initial..picked && test_path_is_missing .git/sequencer ' test_done