(command.CommandList children: [ (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:test_description) op: assign_op.Equal rhs: { (SQ (Token id:Id.Lit_Chars val:'git rebase preserve merges\n' span_id:15) (Token id:Id.Lit_Chars val:'\n' span_id:16) (Token id: Id.Lit_Chars val: 'This test runs git rebase with -p and tries to squash a commit from after\n' span_id: 17 ) (Token id:Id.Lit_Chars val:'a merge to before the merge.\n' span_id:18) ) } spids: [13] ) ] ) (C {(.)} {(./test-lib.sh)}) (C {(.)} {(DQ ($ Id.VSub_DollarName '$TEST_DIRECTORY')) (/lib-rebase.sh)}) (C {(set_fake_editor)}) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:setup span_id:56))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:60) (Token id:Id.Lit_Chars val:'\ttest_commit A1 &&\n' span_id:61) (Token id:Id.Lit_Chars val:'\ttest_commit B1 &&\n' span_id:62) (Token id:Id.Lit_Chars val:'\ttest_commit C1 &&\n' span_id:63) (Token id:Id.Lit_Chars val:'\tgit reset --hard B1 &&\n' span_id:64) (Token id:Id.Lit_Chars val:'\ttest_commit D1 &&\n' span_id:65) (Token id:Id.Lit_Chars val:'\ttest_merge E1 C1 &&\n' span_id:66) (Token id:Id.Lit_Chars val:'\ttest_commit F1\n' span_id:67) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'squash F1 into D1' span_id:92))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:96) (Token id: Id.Lit_Chars val: '\tFAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&\n' span_id: 97 ) (Token id: Id.Lit_Chars val: '\ttest "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&\n' span_id: 98 ) (Token id: Id.Lit_Chars val: '\ttest "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&\n' span_id: 99 ) (Token id:Id.Lit_Chars val:'\tgit tag E2\n' span_id:100) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'rebase two levels of merge' span_id:141))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:145) (Token id:Id.Lit_Chars val:'\tgit checkout A1 &&\n' span_id:146) (Token id:Id.Lit_Chars val:'\ttest_commit G1 &&\n' span_id:147) (Token id:Id.Lit_Chars val:'\ttest_commit H1 &&\n' span_id:148) (Token id:Id.Lit_Chars val:'\ttest_commit I1 &&\n' span_id:149) (Token id:Id.Lit_Chars val:'\tgit checkout -b branch3 H1 &&\n' span_id:150) (Token id:Id.Lit_Chars val:'\ttest_commit J1 &&\n' span_id:151) (Token id:Id.Lit_Chars val:'\ttest_merge K1 I1 &&\n' span_id:152) (Token id:Id.Lit_Chars val:'\tgit checkout -b branch2 G1 &&\n' span_id:153) (Token id:Id.Lit_Chars val:'\ttest_commit L1 &&\n' span_id:154) (Token id:Id.Lit_Chars val:'\ttest_merge M1 K1 &&\n' span_id:155) (Token id:Id.Lit_Chars val:'\tGIT_EDITOR=: git rebase -i -p E2 &&\n' span_id:156) (Token id: Id.Lit_Chars val: '\ttest "$(git rev-parse HEAD~3)" = "$(git rev-parse E2)" &&\n' span_id: 157 ) (Token id: Id.Lit_Chars val: '\ttest "$(git rev-parse HEAD~2)" = "$(git rev-parse HEAD^2^2~2)" &&\n' span_id: 158 ) (Token id: Id.Lit_Chars val: '\ttest "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse HEAD^2^2^1)"\n' span_id: 159 ) ) } ) (C {(test_done)}) ] )