(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "merge-recursive backend test">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo hello >a &&\n"> <LIT_CHARS "\to0=$(git hash-object a) &&\n"> <LIT_CHARS "\tcp a b &&\n"> <LIT_CHARS "\tcp a c &&\n"> <LIT_CHARS "\tmkdir d &&\n"> <LIT_CHARS "\tcp a d/e &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit add a b c d/e &&\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\tc0=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\tgit branch side &&\n"> <LIT_CHARS "\tgit branch df-1 &&\n"> <LIT_CHARS "\tgit branch df-2 &&\n"> <LIT_CHARS "\tgit branch df-3 &&\n"> <LIT_CHARS "\tgit branch remove &&\n"> <LIT_CHARS "\tgit branch submod &&\n"> <LIT_CHARS "\tgit branch copy &&\n"> <LIT_CHARS "\tgit branch rename &&\n"> <LIT_CHARS "\tgit branch rename-ln &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo hello >>a &&\n"> <LIT_CHARS "\tcp a d/e &&\n"> <LIT_CHARS "\to1=$(git hash-object a) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit add a d/e &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"master modifies a and d/e\" &&\n"> <LIT_CHARS "\tc1=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o1\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o1\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 2">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf [abcd] &&\n"> <LIT_CHARS "\tgit checkout side &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo goodbye >>a &&\n"> <LIT_CHARS "\to2=$(git hash-object a) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"side modifies a\" &&\n"> <LIT_CHARS "\tc2=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o2\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o2 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 3">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf [abcd] &&\n"> <LIT_CHARS "\tgit checkout df-1 &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -f b && mkdir b && echo df-1 >b/c && git add b/c &&\n"> <LIT_CHARS "\to3=$(git hash-object b/c) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"df-1 makes b/c\" &&\n"> <LIT_CHARS "\tc3=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o3\tb/c\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o3 0\tb/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 4">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf [abcd] &&\n"> <LIT_CHARS "\tgit checkout df-2 &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -f a && mkdir a && echo df-2 >a/c && git add a/c &&\n"> <LIT_CHARS "\to4=$(git hash-object a/c) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"df-2 makes a/c\" &&\n"> <LIT_CHARS "\tc4=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o4\ta/c\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o4 0\ta/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 5">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf [abcd] &&\n"> <LIT_CHARS "\tgit checkout remove &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -f b &&\n"> <LIT_CHARS "\techo remove-conflict >a &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit rm b &&\n"> <LIT_CHARS "\to5=$(git hash-object a) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"remove removes b and modifies a\" &&\n"> <LIT_CHARS "\tc5=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o5\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o5 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 6">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf [abcd] &&\n"> <LIT_CHARS "\tgit checkout df-3 &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr d && echo df-3 >d && git add d &&\n"> <LIT_CHARS "\to6=$(git hash-object d) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"df-3 makes d\" &&\n"> <LIT_CHARS "\tc6=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o6\td\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o6 0\td\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 7">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout submod &&\n"> <LIT_CHARS "\tgit rm d/e &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"remove d/e\" &&\n"> <LIT_CHARS "\tgit update-index --add --cacheinfo 160000 $c1 d &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"make d/ a submodule\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 8">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout rename &&\n"> <LIT_CHARS "\tgit mv a e &&\n"> <LIT_CHARS "\tgit add e &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"rename a->e\" &&\n"> <LIT_CHARS "\tc7=$(git rev-parse --verify HEAD) &&\n"> <LIT_CHARS "\tgit checkout rename-ln &&\n"> <LIT_CHARS "\tgit mv a e &&\n"> <LIT_CHARS "\ttest_ln_s_add e a &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"rename a->e, symlink a->e\" &&\n"> <LIT_CHARS "\toln=$(printf e | git hash-object --stdin)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup 9">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout copy &&\n"> <LIT_CHARS "\tcp a e &&\n"> <LIT_CHARS "\tgit add e &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"copy a->e\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive simple">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit checkout -f \"$c2\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_expect_code 1 git merge-recursive \"$c0\" -- \"$c2\" \"$c1\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive result">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o0 1\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o2 2\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 3\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "fail if the index has unresolved entries">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit checkout -f \"$c1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge \"$c5\" &&\n"> <LIT_CHARS "\ttest_must_fail git merge \"$c5\" 2> out &&\n"> <LIT_CHARS "\ttest_i18ngrep \"not possible because you have unmerged files\" out &&\n"> <LIT_CHARS "\tgit add -u &&\n"> <LIT_CHARS "\ttest_must_fail git merge \"$c5\" 2> out &&\n"> <LIT_CHARS "\ttest_i18ngrep \"You have not concluded your merge\" out &&\n"> <LIT_CHARS "\trm -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest_must_fail git merge \"$c5\" 2> out &&\n"> <LIT_CHARS "\ttest_i18ngrep \"Your local changes to the following files would be overwritten by merge:\" out\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive remove conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit checkout -f \"$c1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_expect_code 1 git merge-recursive \"$c0\" -- \"$c1\" \"$c5\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive remove conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o0 1\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 2\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o5 3\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f simple">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout -f \"$c1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge-recursive \"$c0\" -- \"$c1\" \"$c3\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive result">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o3 0\tb/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout -f \"$c1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_expect_code 1 git merge-recursive \"$c0\" -- \"$c1\" \"$c4\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict result">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o0 1\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 2\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o4 0\ta/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict the other way">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout -f \"$c4\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_expect_code 1 git merge-recursive \"$c0\" -- \"$c4\" \"$c1\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict result the other way">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o0 1\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 3\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o4 0\ta/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout -f \"$c1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_expect_code 1 git merge-recursive \"$c0\" -- \"$c1\" \"$c6\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict result">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o6 3\td\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 1\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 2\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr [abcd] &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout -f \"$c6\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_expect_code 1 git merge-recursive \"$c0\" -- \"$c6\" \"$c1\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive d/f conflict result">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o6 2\td\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 1\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 3\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "reset and 3-way merge">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard \"$c2\" &&\n"> <LIT_CHARS "\tgit read-tree -m \"$c0\" \"$c2\" \"$c1\"\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "reset and bind merge">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard master &&\n"> <LIT_CHARS "\tgit read-tree --prefix=M/ master &&\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tM/a\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tM/b\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tM/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tM/d/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --prefix=a1/ master &&\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tM/a\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tM/b\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tM/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tM/d/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta1/a\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta1/b\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta1/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta1/d/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --prefix=z/ master &&\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tM/a\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tM/b\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tM/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tM/d/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta1/a\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta1/b\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\ta1/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\ta1/d/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tz/a\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tz/b\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tz/c\"\n"> <LIT_CHARS "\t\techo \"100644 $o1 0\tz/d/e\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive w/ empty work tree - ours has rename">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tGIT_WORK_TREE=\"$PWD/ours-has-rename-work\" &&\n"> <LIT_CHARS "\t\texport GIT_WORK_TREE &&\n"> <LIT_CHARS "\t\tGIT_INDEX_FILE=\"$PWD/ours-has-rename-index\" &&\n"> <LIT_CHARS "\t\texport GIT_INDEX_FILE &&\n"> <LIT_CHARS "\t\tmkdir \"$GIT_WORK_TREE\" &&\n"> <LIT_CHARS "\t\tgit read-tree -i -m $c7 &&\n"> <LIT_CHARS "\t\tgit update-index --ignore-missing --refresh &&\n"> <LIT_CHARS "\t\tgit merge-recursive $c0 -- $c7 $c3 &&\n"> <LIT_CHARS "\t\tgit ls-files -s >actual-files\n"> <LIT_CHARS "\t) 2>actual-err &&\n"> <LIT_CHARS "\t>expected-err &&\n"> <LIT_CHARS "\tcat >expected-files <<-EOF &&\n"> <LIT_CHARS "\t100644 $o3 0\tb/c\n"> <LIT_CHARS "\t100644 $o0 0\tc\n"> <LIT_CHARS "\t100644 $o0 0\td/e\n"> <LIT_CHARS "\t100644 $o0 0\te\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_cmp expected-files actual-files &&\n"> <LIT_CHARS "\ttest_cmp expected-err actual-err\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive w/ empty work tree - theirs has rename">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tGIT_WORK_TREE=\"$PWD/theirs-has-rename-work\" &&\n"> <LIT_CHARS "\t\texport GIT_WORK_TREE &&\n"> <LIT_CHARS "\t\tGIT_INDEX_FILE=\"$PWD/theirs-has-rename-index\" &&\n"> <LIT_CHARS "\t\texport GIT_INDEX_FILE &&\n"> <LIT_CHARS "\t\tmkdir \"$GIT_WORK_TREE\" &&\n"> <LIT_CHARS "\t\tgit read-tree -i -m $c3 &&\n"> <LIT_CHARS "\t\tgit update-index --ignore-missing --refresh &&\n"> <LIT_CHARS "\t\tgit merge-recursive $c0 -- $c3 $c7 &&\n"> <LIT_CHARS "\t\tgit ls-files -s >actual-files\n"> <LIT_CHARS "\t) 2>actual-err &&\n"> <LIT_CHARS "\t>expected-err &&\n"> <LIT_CHARS "\tcat >expected-files <<-EOF &&\n"> <LIT_CHARS "\t100644 $o3 0\tb/c\n"> <LIT_CHARS "\t100644 $o0 0\tc\n"> <LIT_CHARS "\t100644 $o0 0\td/e\n"> <LIT_CHARS "\t100644 $o0 0\te\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_cmp expected-files actual-files &&\n"> <LIT_CHARS "\ttest_cmp expected-err actual-err\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge removes empty directories">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard master &&\n"> <LIT_CHARS "\tgit checkout -b rm &&\n"> <LIT_CHARS "\tgit rm d/e &&\n"> <LIT_CHARS "\tgit commit -mremoved-d/e &&\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tgit merge -s recursive rm &&\n"> <LIT_CHARS "\ttest_must_fail test -d d\n">]})
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "merge-recursive simple w/submodule">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout submod &&\n"> <LIT_CHARS "\tgit merge remove\n">]})
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "merge-recursive simple w/submodule result">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -s >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 $o5 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"160000 $c1 0\td\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive copy vs. rename">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -f copy &&\n"> <LIT_CHARS "\tgit merge rename &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD && git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\te\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\te\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "merge-recursive rename vs. rename/symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -f rename &&\n"> <LIT_CHARS "\tgit merge rename-ln &&\n"> <LIT_CHARS "\t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\techo \"120000 blob $oln\ta\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 blob $o0\te\"\n"> <LIT_CHARS "\t\techo \"120000 $oln 0\ta\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tb\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\tc\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\td/e\"\n"> <LIT_CHARS "\t\techo \"100644 $o0 0\te\"\n"> <LIT_CHARS "\t) >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merging with triple rename across D/F conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard HEAD &&\n"> <LIT_CHARS "\tgit checkout -b main &&\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo \"just a file\" >sub1 &&\n"> <LIT_CHARS "\tmkdir -p sub2 &&\n"> <LIT_CHARS "\techo content1 >sub2/file1 &&\n"> <LIT_CHARS "\techo content2 >sub2/file2 &&\n"> <LIT_CHARS "\techo content3 >sub2/file3 &&\n"> <LIT_CHARS "\tmkdir simple &&\n"> <LIT_CHARS "\techo base >simple/bar &&\n"> <LIT_CHARS "\tgit add -A &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m base &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b other &&\n"> <LIT_CHARS "\techo more >>simple/bar &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -a -m changesimplefile &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout main &&\n"> <LIT_CHARS "\tgit rm sub1 &&\n"> <LIT_CHARS "\tgit mv sub2 sub1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m changefiletodir &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge other\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge-recursive remembers the names of all base trees">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard HEAD &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# more trees than static slots used by oid_to_hex()\n"> <LIT_CHARS "\tfor commit in $c0 $c2 $c4 $c5 $c6 $c7\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\tgit rev-parse \"$commit^{tree}\"\n"> <LIT_CHARS "\tdone >trees &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# ignore the return code -- it only fails because the input is weird\n"> <LIT_CHARS "\ttest_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# merge-recursive prints in reverse order, but we do not care\n"> <LIT_CHARS "\tsort <trees >expect &&\n"> <LIT_CHARS "\tsed -n \"s/^virtual //p\" out | sort >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_done]})
)