(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "merging with submodules">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS setup]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir sub &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git init &&\n"> <LIT_CHARS "\t echo original > file &&\n"> <LIT_CHARS "\t git add file &&\n"> <LIT_CHARS "\t test_tick &&\n"> <LIT_CHARS "\t git commit -m sub-root) &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m root &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b a master &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t echo A > file &&\n"> <LIT_CHARS "\t git add file &&\n"> <LIT_CHARS "\t test_tick &&\n"> <LIT_CHARS "\t git commit -m sub-a) &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m a &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b b master &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t echo B > file &&\n"> <LIT_CHARS "\t git add file &&\n"> <LIT_CHARS "\t test_tick &&\n"> <LIT_CHARS "\t git commit -m sub-b) &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m b &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b c a &&\n"> <LIT_CHARS "\tgit merge -s ours b &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b d b &&\n"> <LIT_CHARS "\tgit merge -s ours a\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup for merge search">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir merge-search &&\n"> <LIT_CHARS "\t(cd merge-search &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\tmkdir sub &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git init &&\n"> <LIT_CHARS "\t echo \"file-a\" > file-a &&\n"> <LIT_CHARS "\t git add file-a &&\n"> <LIT_CHARS "\t git commit -m \"sub-a\" &&\n"> <LIT_CHARS "\t git branch sub-a) &&\n"> <LIT_CHARS "\tgit commit --allow-empty -m init &&\n"> <LIT_CHARS "\tgit branch init &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\tgit commit -m \"a\" &&\n"> <LIT_CHARS "\tgit branch a &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b b &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout -b sub-b &&\n"> <LIT_CHARS "\t echo \"file-b\" > file-b &&\n"> <LIT_CHARS "\t git add file-b &&\n"> <LIT_CHARS "\t git commit -m \"sub-b\") &&\n"> <LIT_CHARS "\tgit commit -a -m \"b\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b c a &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout -b sub-c sub-a &&\n"> <LIT_CHARS "\t echo \"file-c\" > file-c &&\n"> <LIT_CHARS "\t git add file-c &&\n"> <LIT_CHARS "\t git commit -m \"sub-c\") &&\n"> <LIT_CHARS "\tgit commit -a -m \"c\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b d a &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout -b sub-d sub-b &&\n"> <LIT_CHARS "\t git merge sub-c) &&\n"> <LIT_CHARS "\tgit commit -a -m \"d\" &&\n"> <LIT_CHARS "\tgit branch test b &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b g init &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout -b sub-g sub-c) &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\tgit commit -a -m \"g\")\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge with one side as a fast-forward of the other">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(cd merge-search &&\n"> <LIT_CHARS "\t git checkout -b test-forward b &&\n"> <LIT_CHARS "\t git merge d &&\n"> <LIT_CHARS "\t git ls-tree test-forward sub | cut -f1 | cut -f3 -d\" \" > actual &&\n"> <LIT_CHARS "\t (cd sub &&\n"> <LIT_CHARS "\t  git rev-parse sub-d > ../expect) &&\n"> <LIT_CHARS "\t test_cmp actual expect)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merging should conflict for non fast-forward">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(cd merge-search &&\n"> <LIT_CHARS "\t git checkout -b test-nonforward b &&\n"> <LIT_CHARS "\t (cd sub &&\n"> <LIT_CHARS "\t  git rev-parse sub-d > ../expect) &&\n"> <LIT_CHARS "\t test_must_fail git merge c 2> actual  &&\n"> <LIT_CHARS "\t grep $(cat expect) actual > /dev/null &&\n"> <LIT_CHARS "\t git reset --hard)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merging should fail for ambiguous common parent">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(cd merge-search &&\n"> <LIT_CHARS "\tgit checkout -b test-ambiguous b &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout -b ambiguous sub-b &&\n"> <LIT_CHARS "\t git merge sub-c &&\n"> <LIT_CHARS "\t git rev-parse sub-d > ../expect1 &&\n"> <LIT_CHARS "\t git rev-parse ambiguous > ../expect2) &&\n"> <LIT_CHARS "\ttest_must_fail git merge c 2> actual &&\n"> <LIT_CHARS "\tgrep $(cat expect1) actual > /dev/null &&\n"> <LIT_CHARS "\tgrep $(cat expect2) actual > /dev/null &&\n"> <LIT_CHARS "\tgit reset --hard)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merging should fail for changes that are backwards">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(cd merge-search &&\n"> <LIT_CHARS "\tgit checkout -b bb a &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout sub-b) &&\n"> <LIT_CHARS "\tgit commit -a -m \"bb\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b e bb &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout sub-a) &&\n"> <LIT_CHARS "\tgit commit -a -m \"e\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b f bb &&\n"> <LIT_CHARS "\t(cd sub &&\n"> <LIT_CHARS "\t git checkout sub-d) &&\n"> <LIT_CHARS "\tgit commit -a -m \"f\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b test-backward e &&\n"> <LIT_CHARS "\ttest_must_fail git merge f)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git submodule status should display the merge conflict properly with merge base">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "       (cd merge-search &&\n"> <LIT_CHARS "       cat >.gitmodules <<EOF &&\n"> <LIT_CHARS "[submodule \"sub\"]\n"> <LIT_CHARS "       path = sub\n"> <LIT_CHARS "       url = $TRASH_DIRECTORY/sub\n"> <LIT_CHARS "EOF\n"> <LIT_CHARS "       cat >expect <<EOF &&\n"> <LIT_CHARS "U0000000000000000000000000000000000000000 sub\n"> <LIT_CHARS "EOF\n"> <LIT_CHARS "       git submodule status > actual &&\n"> <LIT_CHARS "       test_cmp expect actual &&\n"> <LIT_CHARS "\tgit reset --hard)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git submodule status should display the merge conflict properly without merge-base">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "       (cd merge-search &&\n"> <LIT_CHARS "\tgit checkout -b test-no-merge-base g &&\n"> <LIT_CHARS "\ttest_must_fail git merge b &&\n"> <LIT_CHARS "       cat >.gitmodules <<EOF &&\n"> <LIT_CHARS "[submodule \"sub\"]\n"> <LIT_CHARS "       path = sub\n"> <LIT_CHARS "       url = $TRASH_DIRECTORY/sub\n"> <LIT_CHARS "EOF\n"> <LIT_CHARS "       cat >expect <<EOF &&\n"> <LIT_CHARS "U0000000000000000000000000000000000000000 sub\n"> <LIT_CHARS "EOF\n"> <LIT_CHARS "       git submodule status > actual &&\n"> <LIT_CHARS "       test_cmp expect actual &&\n"> <LIT_CHARS "       git reset --hard)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merging with a modify/modify conflict between merge bases">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard HEAD &&\n"> <LIT_CHARS "\tgit checkout -b test2 c &&\n"> <LIT_CHARS "\tgit merge d\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup for recursive merge with submodule">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir merge-recursive &&\n"> <LIT_CHARS "\t(cd merge-recursive &&\n"> <LIT_CHARS "\t git init &&\n"> <LIT_CHARS "\t mkdir sub &&\n"> <LIT_CHARS "\t (cd sub &&\n"> <LIT_CHARS "\t  git init &&\n"> <LIT_CHARS "\t  test_commit a &&\n"> <LIT_CHARS "\t  git checkout -b sub-b master &&\n"> <LIT_CHARS "\t  test_commit b &&\n"> <LIT_CHARS "\t  git checkout -b sub-c master &&\n"> <LIT_CHARS "\t  test_commit c &&\n"> <LIT_CHARS "\t  git checkout -b sub-bc sub-b &&\n"> <LIT_CHARS "\t  git merge sub-c &&\n"> <LIT_CHARS "\t  git checkout -b sub-cb sub-c &&\n"> <LIT_CHARS "\t  git merge sub-b &&\n"> <LIT_CHARS "\t  git checkout master) &&\n"> <LIT_CHARS "\t git add sub &&\n"> <LIT_CHARS "\t git commit -m a &&\n"> <LIT_CHARS "\t git checkout -b top-b master &&\n"> <LIT_CHARS "\t (cd sub && git checkout sub-b) &&\n"> <LIT_CHARS "\t git add sub &&\n"> <LIT_CHARS "\t git commit -m b &&\n"> <LIT_CHARS "\t git checkout -b top-c master &&\n"> <LIT_CHARS "\t (cd sub && git checkout sub-c) &&\n"> <LIT_CHARS "\t git add sub &&\n"> <LIT_CHARS "\t git commit -m c &&\n"> <LIT_CHARS "\t git checkout -b top-bc top-b &&\n"> <LIT_CHARS "\t git merge -s ours --no-commit top-c &&\n"> <LIT_CHARS "\t (cd sub && git checkout sub-bc) &&\n"> <LIT_CHARS "\t git add sub &&\n"> <LIT_CHARS "\t git commit -m bc &&\n"> <LIT_CHARS "\t git checkout -b top-cb top-c &&\n"> <LIT_CHARS "\t git merge -s ours --no-commit top-b &&\n"> <LIT_CHARS "\t (cd sub && git checkout sub-cb) &&\n"> <LIT_CHARS "\t git add sub &&\n"> <LIT_CHARS "\t git commit -m cb)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "recursive merge with submodule">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(cd merge-recursive &&\n"> <LIT_CHARS "\t test_must_fail git merge top-bc &&\n"> <LIT_CHARS "\t echo \"160000 $(git rev-parse top-cb:sub) 2\tsub\" > expect2 &&\n"> <LIT_CHARS "\t echo \"160000 $(git rev-parse top-bc:sub) 3\tsub\" > expect3 &&\n"> <LIT_CHARS "\t git ls-files -u > actual &&\n"> <LIT_CHARS "\t grep \"$(cat expect2)\" actual > /dev/null &&\n"> <LIT_CHARS "\t grep \"$(cat expect3)\" actual > /dev/null)\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)