(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:'merge fast-forward and up to date' span_id:6))} spids: [4] ) ] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(setup)} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:20) (Token id:Id.Lit_Chars val:'\t>file &&\n' span_id:21) (Token id:Id.Lit_Chars val:'\tgit add file &&\n' span_id:22) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:23) (Token id:Id.Lit_Chars val:'\tgit commit -m initial &&\n' span_id:24) (Token id:Id.Lit_Chars val:'\tgit tag c0 &&\n' span_id:25) (Token id:Id.Lit_Chars val:'\n' span_id:26) (Token id:Id.Lit_Chars val:'\techo second >file &&\n' span_id:27) (Token id:Id.Lit_Chars val:'\tgit add file &&\n' span_id:28) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:29) (Token id:Id.Lit_Chars val:'\tgit commit -m second &&\n' span_id:30) (Token id:Id.Lit_Chars val:'\tgit tag c1 &&\n' span_id:31) (Token id:Id.Lit_Chars val:'\tgit branch test &&\n' span_id:32) (Token id:Id.Lit_Chars val:'\techo third >file &&\n' span_id:33) (Token id:Id.Lit_Chars val:'\tgit add file &&\n' span_id:34) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:35) (Token id:Id.Lit_Chars val:'\tgit commit -m third &&\n' span_id:36) (Token id:Id.Lit_Chars val:'\tgit tag c2\n' span_id:37) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'merge -s recursive up-to-date' span_id:44))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:48) (Token id:Id.Lit_Chars val:'\n' span_id:49) (Token id:Id.Lit_Chars val:'\tgit reset --hard c1 &&\n' span_id:50) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:51) (Token id:Id.Lit_Chars val:'\tgit merge -s recursive c0 &&\n' span_id:52) (Token id:Id.Lit_Chars val:'\texpect=$(git rev-parse c1) &&\n' span_id:53) (Token id:Id.Lit_Chars val:'\tcurrent=$(git rev-parse HEAD) &&\n' span_id:54) (Token id:Id.Lit_Chars val:'\ttest "$expect" = "$current"\n' span_id:55) (Token id:Id.Lit_Chars val:'\n' span_id:56) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'merge -s recursive fast-forward' span_id:63))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:67) (Token id:Id.Lit_Chars val:'\n' span_id:68) (Token id:Id.Lit_Chars val:'\tgit reset --hard c0 &&\n' span_id:69) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:70) (Token id:Id.Lit_Chars val:'\tgit merge -s recursive c1 &&\n' span_id:71) (Token id:Id.Lit_Chars val:'\texpect=$(git rev-parse c1) &&\n' span_id:72) (Token id:Id.Lit_Chars val:'\tcurrent=$(git rev-parse HEAD) &&\n' span_id:73) (Token id:Id.Lit_Chars val:'\ttest "$expect" = "$current"\n' span_id:74) (Token id:Id.Lit_Chars val:'\n' span_id:75) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'merge -s ours up-to-date' span_id:82))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:86) (Token id:Id.Lit_Chars val:'\n' span_id:87) (Token id:Id.Lit_Chars val:'\tgit reset --hard c1 &&\n' span_id:88) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:89) (Token id:Id.Lit_Chars val:'\tgit merge -s ours c0 &&\n' span_id:90) (Token id:Id.Lit_Chars val:'\texpect=$(git rev-parse c1) &&\n' span_id:91) (Token id:Id.Lit_Chars val:'\tcurrent=$(git rev-parse HEAD) &&\n' span_id:92) (Token id:Id.Lit_Chars val:'\ttest "$expect" = "$current"\n' span_id:93) (Token id:Id.Lit_Chars val:'\n' span_id:94) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'merge -s ours fast-forward' span_id:101))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:105) (Token id:Id.Lit_Chars val:'\n' span_id:106) (Token id:Id.Lit_Chars val:'\tgit reset --hard c0 &&\n' span_id:107) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:108) (Token id:Id.Lit_Chars val:'\tgit merge -s ours c1 &&\n' span_id:109) (Token id:Id.Lit_Chars val:'\texpect=$(git rev-parse c0^{tree}) &&\n' span_id:110) (Token id: Id.Lit_Chars val: '\tcurrent=$(git rev-parse HEAD^{tree}) &&\n' span_id: 111 ) (Token id:Id.Lit_Chars val:'\ttest "$expect" = "$current"\n' span_id:112) (Token id:Id.Lit_Chars val:'\n' span_id:113) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'merge -s subtree up-to-date' span_id:120))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:124) (Token id:Id.Lit_Chars val:'\n' span_id:125) (Token id:Id.Lit_Chars val:'\tgit reset --hard c1 &&\n' span_id:126) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:127) (Token id:Id.Lit_Chars val:'\tgit merge -s subtree c0 &&\n' span_id:128) (Token id:Id.Lit_Chars val:'\texpect=$(git rev-parse c1) &&\n' span_id:129) (Token id:Id.Lit_Chars val:'\tcurrent=$(git rev-parse HEAD) &&\n' span_id:130) (Token id:Id.Lit_Chars val:'\ttest "$expect" = "$current"\n' span_id:131) (Token id:Id.Lit_Chars val:'\n' span_id:132) ) } ) (C {(test_expect_success)} {(SQ (Token id:Id.Lit_Chars val:'merge fast-forward octopus' span_id:139))} { (SQ (Token id:Id.Lit_Chars val:'\n' span_id:143) (Token id:Id.Lit_Chars val:'\n' span_id:144) (Token id:Id.Lit_Chars val:'\tgit reset --hard c0 &&\n' span_id:145) (Token id:Id.Lit_Chars val:'\ttest_tick &&\n' span_id:146) (Token id:Id.Lit_Chars val:'\tgit merge c1 c2 &&\n' span_id:147) (Token id:Id.Lit_Chars val:'\texpect=$(git rev-parse c2) &&\n' span_id:148) (Token id:Id.Lit_Chars val:'\tcurrent=$(git rev-parse HEAD) &&\n' span_id:149) (Token id:Id.Lit_Chars val:'\ttest "$expect" = "$current"\n' span_id:150) ) } ) (C {(test_done)}) ] )