(CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: { (SQ <"git rebase preserve merges\n"> <"\n"> <"This test runs git rebase with -p and tries to squash a commit from after\n"> <"a merge to before the merge.\n"> ) } spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (C {(.)} {(DQ ($ VSub_Name "$TEST_DIRECTORY")) (/lib-rebase.sh)}) (C {(set_fake_editor)}) (C {(test_expect_success)} {(SQ <setup>)} { (SQ <"\n"> <"\ttest_commit A1 &&\n"> <"\ttest_commit B1 &&\n"> <"\ttest_commit C1 &&\n"> <"\tgit reset --hard B1 &&\n"> <"\ttest_commit D1 &&\n"> <"\ttest_merge E1 C1 &&\n"> <"\ttest_commit F1\n"> ) } ) (C {(test_expect_success)} {(SQ <"squash F1 into D1">)} { (SQ <"\n"> <"\tFAKE_LINES=\"1 squash 4 2 3\" git rebase -i -p B1 &&\n"> <"\ttest \"$(git rev-parse HEAD^2)\" = \"$(git rev-parse C1)\" &&\n"> <"\ttest \"$(git rev-parse HEAD~2)\" = \"$(git rev-parse B1)\" &&\n"> <"\tgit tag E2\n"> ) } ) (C {(test_expect_success)} {(SQ <"rebase two levels of merge">)} { (SQ <"\n"> <"\tgit checkout A1 &&\n"> <"\ttest_commit G1 &&\n"> <"\ttest_commit H1 &&\n"> <"\ttest_commit I1 &&\n"> <"\tgit checkout -b branch3 H1 &&\n"> <"\ttest_commit J1 &&\n"> <"\ttest_merge K1 I1 &&\n"> <"\tgit checkout -b branch2 G1 &&\n"> <"\ttest_commit L1 &&\n"> <"\ttest_merge M1 K1 &&\n"> <"\tGIT_EDITOR=: git rebase -i -p E2 &&\n"> <"\ttest \"$(git rev-parse HEAD~3)\" = \"$(git rev-parse E2)\" &&\n"> <"\ttest \"$(git rev-parse HEAD~2)\" = \"$(git rev-parse HEAD^2^2~2)\" &&\n"> <"\ttest \"$(git rev-parse HEAD^2^1^1)\" = \"$(git rev-parse HEAD^2^2^1)\"\n"> ) } ) (C {(test_done)}) ] )