(command.CommandList children: [ (command.Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (lhs_expr.LhsName name:test_description spids:[12]) op: Equal rhs: {(SQ <'"git merge" top-level frontend'>)} spids: [12] ) ] spids: [12] ) (C {(.)} {(./test-lib.sh)}) (command.FuncDef name: t3033_reset body: (command.BraceGroup children: [ (command.AndOr ops: [Op_DAmp Op_DAmp] children: [ (C {(git)} {(checkout)} {(-B)} {(master)} {(two)}) (C {(git)} {(branch)} {(-f)} {(left)} {(three)}) (C {(git)} {(branch)} {(-f)} {(right)} {(four)}) ] ) ] spids: [28] ) spids: [23 27] ) (C {(test_expect_success)} {(setup)} { (SQ <'\n'> <'\ttest_commit one &&\n'> <'\tgit branch left &&\n'> <'\tgit branch right &&\n'> <'\ttest_commit two &&\n'> <'\tgit checkout left &&\n'> <'\ttest_commit three &&\n'> <'\tgit checkout right &&\n'> <'\ttest_commit four &&\n'> <'\tgit checkout --orphan newroot &&\n'> <'\ttest_commit five &&\n'> <'\tgit checkout master\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge an octopus into void'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit checkout --orphan test &&\n'> <'\tgit rm -fr . &&\n'> <'\ttest_must_fail git merge left right &&\n'> <'\ttest_must_fail git rev-parse --verify HEAD &&\n'> <'\tgit diff --quiet &&\n'> <'\ttest_must_fail git rev-parse HEAD\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge an octopus, fast-forward (ff)'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit reset --hard one &&\n'> <'\tgit merge left right &&\n'> <'\t# one is ancestor of three (left) and four (right)\n'> <'\ttest_must_fail git rev-parse --verify HEAD^3 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 | sort >actual &&\n'> <'\tgit rev-parse three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge octopus, non-fast-forward (ff)'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit reset --hard one &&\n'> <'\tgit merge --no-ff left right &&\n'> <'\t# one is ancestor of three (left) and four (right)\n'> <'\ttest_must_fail git rev-parse --verify HEAD^4 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&\n'> <'\tgit rev-parse one three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge octopus, fast-forward (does not ff)'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit merge left right &&\n'> <'\t# two (master) is not an ancestor of three (left) and four (right)\n'> <'\ttest_must_fail git rev-parse --verify HEAD^4 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&\n'> <'\tgit rev-parse two three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge octopus, non-fast-forward'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit merge --no-ff left right &&\n'> <'\ttest_must_fail git rev-parse --verify HEAD^4 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&\n'> <'\tgit rev-parse two three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge FETCH_HEAD octopus into void'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit checkout --orphan test &&\n'> <'\tgit rm -fr . &&\n'> <'\tgit fetch . left right &&\n'> <'\ttest_must_fail git merge FETCH_HEAD &&\n'> <'\ttest_must_fail git rev-parse --verify HEAD &&\n'> <'\tgit diff --quiet &&\n'> <'\ttest_must_fail git rev-parse HEAD\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge FETCH_HEAD octopus fast-forward (ff)'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit reset --hard one &&\n'> <'\tgit fetch . left right &&\n'> <'\tgit merge FETCH_HEAD &&\n'> <'\t# one is ancestor of three (left) and four (right)\n'> <'\ttest_must_fail git rev-parse --verify HEAD^3 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 | sort >actual &&\n'> <'\tgit rev-parse three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge FETCH_HEAD octopus non-fast-forward (ff)'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit reset --hard one &&\n'> <'\tgit fetch . left right &&\n'> <'\tgit merge --no-ff FETCH_HEAD &&\n'> <'\t# one is ancestor of three (left) and four (right)\n'> <'\ttest_must_fail git rev-parse --verify HEAD^4 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&\n'> <'\tgit rev-parse one three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge FETCH_HEAD octopus fast-forward (does not ff)'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit fetch . left right &&\n'> <'\tgit merge FETCH_HEAD &&\n'> <'\t# two (master) is not an ancestor of three (left) and four (right)\n'> <'\ttest_must_fail git rev-parse --verify HEAD^4 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&\n'> <'\tgit rev-parse two three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'merge FETCH_HEAD octopus non-fast-forward'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit fetch . left right &&\n'> <'\tgit merge --no-ff FETCH_HEAD &&\n'> <'\ttest_must_fail git rev-parse --verify HEAD^4 &&\n'> <'\tgit rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&\n'> <'\tgit rev-parse two three four | sort >expect &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {(test_expect_success)} {(SQ <'refuse two-project merge by default'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit reset --hard four &&\n'> <'\ttest_must_fail git merge five\n'> ) } ) (C {(test_expect_success)} {(SQ <'two-project merge with --allow-unrelated-histories'>)} { (SQ <'\n'> <'\tt3033_reset &&\n'> <'\tgit reset --hard four &&\n'> <'\tgit merge --allow-unrelated-histories five &&\n'> <'\tgit diff --exit-code five\n'> ) } ) (C {(test_done)}) ] )