(CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <'Merge-recursive ours and theirs variants'>)} spids: [4] ) ] spids: [4] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(setup)} { (SQ <'\n'> <'\tfor i in 1 2 3 4 5 6 7 8 9\n'> <'\tdo\n'> <'\t\techo "$i"\n'> <'\tdone >file &&\n'> <'\tgit add file &&\n'> <'\tcp file elif &&\n'> <'\tgit commit -m initial &&\n'> <'\n'> <'\tsed -e "s/1/one/" -e "s/9/nine/" >file <elif &&\n'> <'\tgit commit -a -m ours &&\n'> <'\n'> <'\tgit checkout -b side HEAD^ &&\n'> <'\n'> <'\tsed -e "s/9/nueve/" >file <elif &&\n'> <'\tgit commit -a -m theirs &&\n'> <'\n'> <'\tgit checkout master^0\n'> ) } ) (C {(test_expect_success)} {(SQ <'plain recursive - should conflict'>)} { (SQ <'\n'> <'\tgit reset --hard master &&\n'> <'\ttest_must_fail git merge -s recursive side &&\n'> <'\tgrep nine file &&\n'> <'\tgrep nueve file &&\n'> <'\t! grep 9 file &&\n'> <'\tgrep one file &&\n'> <'\t! grep 1 file\n'> ) } ) (C {(test_expect_success)} {(SQ <'recursive favouring theirs'>)} { (SQ <'\n'> <'\tgit reset --hard master &&\n'> <'\tgit merge -s recursive -Xtheirs side &&\n'> <'\t! grep nine file &&\n'> <'\tgrep nueve file &&\n'> <'\t! grep 9 file &&\n'> <'\tgrep one file &&\n'> <'\t! grep 1 file\n'> ) } ) (C {(test_expect_success)} {(SQ <'recursive favouring ours'>)} { (SQ <'\n'> <'\tgit reset --hard master &&\n'> <'\tgit merge -s recursive -X ours side &&\n'> <'\tgrep nine file &&\n'> <'\t! grep nueve file &&\n'> <'\t! grep 9 file &&\n'> <'\tgrep one file &&\n'> <'\t! grep 1 file\n'> ) } ) (C {(test_expect_success)} {(SQ <'binary file with -Xours/-Xtheirs'>)} { (SQ <'\n'> <'\techo file binary >.gitattributes &&\n'> <'\n'> <'\tgit reset --hard master &&\n'> <'\tgit merge -s recursive -X theirs side &&\n'> <'\tgit diff --exit-code side HEAD -- file &&\n'> <'\n'> <'\tgit reset --hard master &&\n'> <'\tgit merge -s recursive -X ours side &&\n'> <'\tgit diff --exit-code master HEAD -- file\n'> ) } ) (C {(test_expect_success)} {(SQ <'pull passes -X to underlying merge'>)} { (SQ <'\n'> <'\tgit reset --hard master && git pull -s recursive -Xours . side &&\n'> <'\tgit reset --hard master && git pull -s recursive -X ours . side &&\n'> <'\tgit reset --hard master && git pull -s recursive -Xtheirs . side &&\n'> <'\tgit reset --hard master && git pull -s recursive -X theirs . side &&\n'> <'\tgit reset --hard master && test_must_fail git pull -s recursive -X bork . side\n'> ) } ) (C {(test_done)}) ] )