(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "combined diff">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (Com {[LIT_CHARS .]} {[DQ [VarSub TEST_DIRECTORY]] [LIT_CHARS /diff-lib.sh]})
  (FunctionDef setup_helper []
    (AndOr OP_AND_IF
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('one', {[VarSub 1]}), ('branch', {[VarSub 2]}), ('side', {[VarSub 3]})])
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS git]} {[LIT_CHARS branch]} {[VarSub side]} {[VarSub branch]})
        (AndOr OP_AND_IF
          (For l [{[VarSub one]}, {[LIT_CHARS two]}, {[LIT_CHARS three]}, {[LIT_CHARS fyra]}])
            (Com {[LIT_CHARS echo]} {[VarSub l]})
          )
          (AndOr OP_AND_IF
            (Com {[LIT_CHARS git]} {[LIT_CHARS add]} {[LIT_CHARS file]})
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS test_tick]})
              (AndOr OP_AND_IF
                (Com {[LIT_CHARS git]} {[LIT_CHARS commit]} {[LIT_CHARS -m]} {[VarSub branch]})
                (AndOr OP_AND_IF
                  (Com {[LIT_CHARS git]} {[LIT_CHARS checkout]} {[VarSub side]})
                  (AndOr OP_AND_IF
                    (For l [{[VarSub one]}, {[LIT_CHARS two]}, {[LIT_CHARS three]}, {[LIT_CHARS quatro]}])
                      (Com {[LIT_CHARS echo]} {[VarSub l]})
                    )
                    (AndOr OP_AND_IF
                      (Com {[LIT_CHARS git]} {[LIT_CHARS add]} {[LIT_CHARS file]})
                      (AndOr OP_AND_IF
                        (Com {[LIT_CHARS test_tick]})
                        (AndOr OP_AND_IF
                          (Com {[LIT_CHARS git]} {[LIT_CHARS commit]} {[LIT_CHARS -m]} {[VarSub side]})
                          (AndOr OP_AND_IF
                            (Com {[LIT_CHARS test_must_fail]} {[LIT_CHARS git]} {[LIT_CHARS merge]} {[VarSub branch]})
                            (AndOr OP_AND_IF
                              (For l [{[VarSub one]}, {[LIT_CHARS three]}, {[LIT_CHARS four]}])
                                (Com {[LIT_CHARS echo]} {[VarSub l]})
                              )
                              (AndOr OP_AND_IF
                                (Com {[LIT_CHARS git]} {[LIT_CHARS add]} {[LIT_CHARS file]})
                                (AndOr OP_AND_IF
                                  (Com {[LIT_CHARS test_tick]})
                                  (Com {[LIT_CHARS git]} {[LIT_CHARS commit]} {[LIT_CHARS -m]} {[DQ [LIT_CHARS "merge "][VarSub branch][LIT_CHARS " into "][VarSub side]]})
                                )
                              )
                            )
                          )
                        )
                      )
                    )
                  )
                )
              )
            )
          )
        )
      )
    )
  )
  (FunctionDef verify_helper []
    (AndOr OP_AND_IF
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('it', {[VarSub 1]})])
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t\t1,/^@@@/d\n"> <LIT_CHARS "\t\t/^ -/d\n"> <LIT_CHARS "\t\ts/^\\(.\\)./\\1/\n"> <LIT_CHARS "\t">]} {[DQ [VarSub it]]}
          <
          (FilenameRedirectNode filename={[DQ [VarSub it][LIT_CHARS .actual.1]]} <REDIR_GREAT ">"> 1),
          >
        )
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t\t1,/^@@@/d\n"> <LIT_CHARS "\t\t/^- /d\n"> <LIT_CHARS "\t\ts/^.\\(.\\)/\\1/\n"> <LIT_CHARS "\t">]} {[DQ [VarSub it]]}
            <
            (FilenameRedirectNode filename={[DQ [VarSub it][LIT_CHARS .actual.2]]} <REDIR_GREAT ">"> 1),
            >
          )
          (AndOr OP_AND_IF
            (Pipeline
              (Com {[LIT_CHARS git]} {[LIT_CHARS diff]} {[DQ [VarSub it][LIT_CHARS "^"]]} {[DQ [VarSub it]]} {[LIT_CHARS --]})
              (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "1,/^@@/d">]}
                <
                (FilenameRedirectNode filename={[DQ [VarSub it][LIT_CHARS .expect.1]]} <REDIR_GREAT ">"> 1),
                >
              )
            )
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS test_cmp]} {[DQ [VarSub it][LIT_CHARS .expect.1]]} {[DQ [VarSub it][LIT_CHARS .actual.1]]})
              (AndOr OP_AND_IF
                (Pipeline
                  (Com {[LIT_CHARS git]} {[LIT_CHARS diff]} {[DQ [VarSub it][LIT_CHARS "^2"]]} {[DQ [VarSub it]]} {[LIT_CHARS --]})
                  (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "1,/^@@/d">]}
                    <
                    (FilenameRedirectNode filename={[DQ [VarSub it][LIT_CHARS .expect.2]]} <REDIR_GREAT ">"> 1),
                    >
                  )
                )
                (Com {[LIT_CHARS test_cmp]} {[DQ [VarSub it][LIT_CHARS .expect.2]]} {[DQ [VarSub it][LIT_CHARS .actual.2]]})
              )
            )
          )
        )
      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS setup]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t>file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch withone &&\n"> <LIT_CHARS "\tgit branch sansone &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout withone &&\n"> <LIT_CHARS "\tsetup_helper one withone sidewithone &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout sansone &&\n"> <LIT_CHARS "\tsetup_helper \"\" sansone sidesansone\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check combined output (1)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show sidewithone -- >sidewithone &&\n"> <LIT_CHARS "\tverify_helper sidewithone\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check combined output (2)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show sidesansone -- >sidesansone &&\n"> <LIT_CHARS "\tverify_helper sidesansone\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "diagnose truncated file">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t>file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\tgit commit --amend -C HEAD &&\n"> <LIT_CHARS "\tgit show >out &&\n"> <LIT_CHARS "\tgrep \"diff --cc file\" out\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup for --cc --raw">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tblob=$(echo file | git hash-object --stdin -w) &&\n"> <LIT_CHARS "\tbase_tree=$(echo \"100644 blob $blob\tfile\" | git mktree) &&\n"> <LIT_CHARS "\ttrees= &&\n"> <LIT_CHARS "\tfor i in $(test_seq 1 40)\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\tblob=$(echo file$i | git hash-object --stdin -w) &&\n"> <LIT_CHARS "\t\ttrees=\"$trees$(echo \"100644 blob $blob\tfile\" | git mktree)$LF\"\n"> <LIT_CHARS "\tdone\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check --cc --raw with four trees">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tfour_trees=$(echo \"$trees\" | sed -e 4q) &&\n"> <LIT_CHARS "\tgit diff --cc --raw $four_trees $base_tree >out &&\n"> <LIT_CHARS "\t# Check for four leading colons in the output:\n"> <LIT_CHARS "\tgrep \"^::::[^:]\" out\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check --cc --raw with forty trees">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit diff --cc --raw $trees $base_tree >out &&\n"> <LIT_CHARS "\t# Check for forty leading colons in the output:\n"> <LIT_CHARS "\tgrep \"^::::::::::::::::::::::::::::::::::::::::[^:]\" out\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup combined ignore spaces">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >test &&\n"> <LIT_CHARS "\talways coalesce\n"> <LIT_CHARS "\teol space coalesce Q\n"> <LIT_CHARS "\tspace  change coalesce\n"> <LIT_CHARS "\tall spa ces coalesce\n"> <LIT_CHARS "\teol spaces Q\n"> <LIT_CHARS "\tspace  change\n"> <LIT_CHARS "\tall spa ces\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -m \"test space change\" -a &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b side HEAD^ &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >test &&\n"> <LIT_CHARS "\talways coalesce\n"> <LIT_CHARS "\teol space coalesce\n"> <LIT_CHARS "\tspace change coalesce\n"> <LIT_CHARS "\tall spaces coalesce\n"> <LIT_CHARS "\teol spaces\n"> <LIT_CHARS "\tspace change\n"> <LIT_CHARS "\tall spaces\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -m \"test other space changes\" -a &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge master &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >test &&\n"> <LIT_CHARS "\teol spaces Q\n"> <LIT_CHARS "\tspace  change\n"> <LIT_CHARS "\tall spa ces\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -m merged -a\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check combined output (no ignore space)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t--always coalesce\n"> <LIT_CHARS "\t- eol space coalesce\n"> <LIT_CHARS "\t- space change coalesce\n"> <LIT_CHARS "\t- all spaces coalesce\n"> <LIT_CHARS "\t- eol spaces\n"> <LIT_CHARS "\t- space change\n"> <LIT_CHARS "\t- all spaces\n"> <LIT_CHARS "\t -eol space coalesce Q\n"> <LIT_CHARS "\t -space  change coalesce\n"> <LIT_CHARS "\t -all spa ces coalesce\n"> <LIT_CHARS "\t+ eol spaces Q\n"> <LIT_CHARS "\t+ space  change\n"> <LIT_CHARS "\t+ all spa ces\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check combined output (ignore space at eol)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show --ignore-space-at-eol >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t--always coalesce\n"> <LIT_CHARS "\t--eol space coalesce\n"> <LIT_CHARS "\t- space change coalesce\n"> <LIT_CHARS "\t- all spaces coalesce\n"> <LIT_CHARS "\t -space  change coalesce\n"> <LIT_CHARS "\t -all spa ces coalesce\n"> <LIT_CHARS "\t  eol spaces Q\n"> <LIT_CHARS "\t- space change\n"> <LIT_CHARS "\t- all spaces\n"> <LIT_CHARS "\t+ space  change\n"> <LIT_CHARS "\t+ all spa ces\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check combined output (ignore space change)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show -b >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t--always coalesce\n"> <LIT_CHARS "\t--eol space coalesce\n"> <LIT_CHARS "\t--space change coalesce\n"> <LIT_CHARS "\t- all spaces coalesce\n"> <LIT_CHARS "\t -all spa ces coalesce\n"> <LIT_CHARS "\t  eol spaces Q\n"> <LIT_CHARS "\t  space  change\n"> <LIT_CHARS "\t- all spaces\n"> <LIT_CHARS "\t+ all spa ces\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check combined output (ignore all spaces)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show -w >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t--always coalesce\n"> <LIT_CHARS "\t--eol space coalesce\n"> <LIT_CHARS "\t--space change coalesce\n"> <LIT_CHARS "\t--all spaces coalesce\n"> <LIT_CHARS "\t  eol spaces Q\n"> <LIT_CHARS "\t  space  change\n"> <LIT_CHARS "\t  all spa ces\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "combine diff coalesce simple">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\ttest_seq 4 >test &&\n"> <LIT_CHARS "\tgit commit -a -m empty1 &&\n"> <LIT_CHARS "\tgit branch side1 &&\n"> <LIT_CHARS "\tgit checkout HEAD^ &&\n"> <LIT_CHARS "\ttest_seq 5 >test &&\n"> <LIT_CHARS "\tgit commit -a -m empty2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge side1 &&\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit commit -a -m merge &&\n"> <LIT_CHARS "\tgit show >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t--1\n"> <LIT_CHARS "\t--2\n"> <LIT_CHARS "\t--3\n"> <LIT_CHARS "\t--4\n"> <LIT_CHARS "\t- 5\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "combine diff coalesce tricky">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tgit commit -m initial --allow-empty &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t2\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -a -m empty1 &&\n"> <LIT_CHARS "\tgit branch -f side1 &&\n"> <LIT_CHARS "\tgit checkout HEAD^ &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t5\n"> <LIT_CHARS "\t4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -a -m empty2 &&\n"> <LIT_CHARS "\tgit branch -f side2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge side1 &&\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit commit -a -m merge &&\n"> <LIT_CHARS "\tgit show >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t -3\n"> <LIT_CHARS "\t--1\n"> <LIT_CHARS "\t -2\n"> <LIT_CHARS "\t--3\n"> <LIT_CHARS "\t- 5\n"> <LIT_CHARS "\t--4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual &&\n"> <LIT_CHARS "\tgit checkout -f side1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge side2 &&\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit commit -a -m merge &&\n"> <LIT_CHARS "\tgit show >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t- 3\n"> <LIT_CHARS "\t--1\n"> <LIT_CHARS "\t- 2\n"> <LIT_CHARS "\t--3\n"> <LIT_CHARS "\t -5\n"> <LIT_CHARS "\t--4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "combine diff coalesce three parents">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tgit commit -m initial --allow-empty &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t2\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -a -m empty1 &&\n"> <LIT_CHARS "\tgit checkout -B side1 &&\n"> <LIT_CHARS "\tgit checkout HEAD^ &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t7\n"> <LIT_CHARS "\t5\n"> <LIT_CHARS "\t4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -a -m empty2 &&\n"> <LIT_CHARS "\tgit branch -f side2 &&\n"> <LIT_CHARS "\tgit checkout HEAD^ &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t6\n"> <LIT_CHARS "\t5\n"> <LIT_CHARS "\t4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit commit -a -m empty3 &&\n"> <LIT_CHARS "\t>test &&\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tTREE=$(git write-tree) &&\n"> <LIT_CHARS "\tCOMMIT=$(git commit-tree -p HEAD -p side1 -p side2 -m merge $TREE) &&\n"> <LIT_CHARS "\tgit show $COMMIT >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t-- 3\n"> <LIT_CHARS "\t---1\n"> <LIT_CHARS "\t-  6\n"> <LIT_CHARS "\t - 2\n"> <LIT_CHARS "\t --3\n"> <LIT_CHARS "\t  -7\n"> <LIT_CHARS "\t- -5\n"> <LIT_CHARS "\t---4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "combine diff missing delete bug">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit commit -m initial --allow-empty &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t2\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t4\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tgit commit -a -m side1 &&\n"> <LIT_CHARS "\tgit checkout -B side1 &&\n"> <LIT_CHARS "\tgit checkout HEAD^ &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t0\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t2\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t4modified\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tgit commit -m side2 &&\n"> <LIT_CHARS "\tgit branch -f side2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --no-commit side1 &&\n"> <LIT_CHARS "\tcat <<-\\EOF >test &&\n"> <LIT_CHARS "\t1\n"> <LIT_CHARS "\t2\n"> <LIT_CHARS "\t3\n"> <LIT_CHARS "\t4modified\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit add test &&\n"> <LIT_CHARS "\tgit commit -a -m merge &&\n"> <LIT_CHARS "\tgit diff-tree -c -p HEAD >actual.tmp &&\n"> <LIT_CHARS "\tsed -e \"1,/^@@@/d\" < actual.tmp >actual &&\n"> <LIT_CHARS "\ttr -d Q <<-\\EOF >expected &&\n"> <LIT_CHARS "\t- 0\n"> <LIT_CHARS "\t  1\n"> <LIT_CHARS "\t  2\n"> <LIT_CHARS "\t  3\n"> <LIT_CHARS "\t -4\n"> <LIT_CHARS "\t +4modified\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tcompare_diff_patch expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "combine diff gets tree sorting right">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# create a directory and a file that sort differently in trees\n"> <LIT_CHARS "\t# versus byte-wise (implied \"/\" sorts after \".\")\n"> <LIT_CHARS "\tgit checkout -f master &&\n"> <LIT_CHARS "\tmkdir foo &&\n"> <LIT_CHARS "\techo base >foo/one &&\n"> <LIT_CHARS "\techo base >foo/two &&\n"> <LIT_CHARS "\techo base >foo.ext &&\n"> <LIT_CHARS "\tgit add foo foo.ext &&\n"> <LIT_CHARS "\tgit commit -m base &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# one side modifies a file in the directory, along with the root\n"> <LIT_CHARS "\t# file...\n"> <LIT_CHARS "\techo master >foo/one &&\n"> <LIT_CHARS "\techo master >foo.ext &&\n"> <LIT_CHARS "\tgit commit -a -m master &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# the other side modifies the other file in the directory\n"> <LIT_CHARS "\tgit checkout -b other HEAD^ &&\n"> <LIT_CHARS "\techo other >foo/two &&\n"> <LIT_CHARS "\tgit commit -a -m other &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# And now we merge. The files in the subdirectory will resolve cleanly,\n"> <LIT_CHARS "\t# meaning that a combined diff will not find them interesting. But it\n"> <LIT_CHARS "\t# will find the tree itself interesting, because it had to be merged.\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tgit merge other &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tprintf \"MM\\tfoo\\n\" >expect &&\n"> <LIT_CHARS "\tgit diff-tree -c --name-status -t HEAD >actual.tmp &&\n"> <LIT_CHARS "\tsed 1d <actual.tmp >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_done]})
)