(command.CommandList children: [ (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:test_description) op: assign_op.Equal rhs: {(SQ <'cherry-pick should rerere for conflicts'>)} spids: [4] ) ] ) (C {<.>} {<'./test-lib.sh'>}) (C {<test_expect_success>} {<setup>} { (SQ <'\n'> <'\techo foo >foo &&\n'> <'\tgit add foo && test_tick && git commit -q -m 1 &&\n'> <'\techo foo-master >foo &&\n'> <'\tgit add foo && test_tick && git commit -q -m 2 &&\n'> <'\n'> <'\tgit checkout -b dev HEAD^ &&\n'> <'\techo foo-dev >foo &&\n'> <'\tgit add foo && test_tick && git commit -q -m 3 &&\n'> <'\tgit config rerere.enabled true\n'> ) } ) (C {<test_expect_success>} {(SQ <'conflicting merge'>)} {(SQ <'\n'> <'\ttest_must_fail git merge master\n'>)} ) (C {<test_expect_success>} {(SQ <fixup>)} { (SQ <'\n'> <'\techo foo-dev >foo &&\n'> <'\tgit add foo && test_tick && git commit -q -m 4 &&\n'> <'\tgit reset --hard HEAD^ &&\n'> <'\techo foo-dev >expect\n'> ) } ) (C {<test_expect_success>} {(SQ <'cherry-pick conflict'>)} {(SQ <'\n'> <'\ttest_must_fail git cherry-pick master &&\n'> <'\ttest_cmp expect foo\n'>)} ) (C {<test_expect_success>} {(SQ <reconfigure>)} {(SQ <'\n'> <'\tgit config rerere.enabled false &&\n'> <'\tgit reset --hard\n'>)} ) (C {<test_expect_success>} {(SQ <'cherry-pick conflict without rerere'>)} { (SQ <'\n'> <'\ttest_must_fail git cherry-pick master &&\n'> <'\ttest_must_fail test_cmp expect foo\n'> ) } ) (C {<test_done>}) ] )