(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "Two way merge with read-tree -m $H $M\n"> <LIT_CHARS "\n"> <LIT_CHARS "This test tries two-way merge (aka fast-forward with carry forward).\n"> <LIT_CHARS "\n"> <LIT_CHARS "There is the head (called H) and another commit (called M), which is\n"> <LIT_CHARS "simply ahead of H.  The index and the work tree contains a state that\n"> <LIT_CHARS "is derived from H, but may also have local changes.  This test checks\n"> <LIT_CHARS "all the combinations described in the two-tree merge \"carry forward\"\n"> <LIT_CHARS "rules, found in <Documentation/git read-tree.txt>.\n"> <LIT_CHARS "\n"> <LIT_CHARS "In the test, these paths are used:\n"> <LIT_CHARS "        bozbar  - in H, stays in M, modified from bozbar to gnusto\n"> <LIT_CHARS "        frotz   - not in H added in M\n"> <LIT_CHARS "        nitfol  - in H, stays in M unmodified\n"> <LIT_CHARS "        rezrov  - in H, deleted in M\n"> <LIT_CHARS "        yomin   - not in H nor M\n">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (Com {[LIT_CHARS .]} {[DQ [VarSub TEST_DIRECTORY]] [LIT_CHARS /lib-read-tree.sh]}  )
  (FunctionDef read_tree_twoway []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS git]} {[LIT_CHARS read-tree]} {[LIT_CHARS -m]} {[DQ [VarSub 1]]} {[DQ [VarSub 2]]}      )
      (Com {[LIT_CHARS git]} {[LIT_CHARS ls-files]} {[LIT_CHARS --stage]}      )
    )
  )
  (FunctionDef compare_change []
    (List
      (Com {[LIT_CHARS sed]} {[LIT_CHARS -n]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "/^--- /d; /^+++ /d; /^@@ /d;">]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "s/^\\([-+][0-7][0-7][0-7][0-7][0-7][0-7]\\) ">] [DQ [VarSub _x40]] [SQ <LIT_CHARS " /\\1 X /p">]} {[DQ [VarSub 1]]}
        <
        (FilenameRedirectNode filename={[LIT_CHARS current]} <REDIR_GREAT ">"> 1),
        >
      )
      (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS expected]} {[LIT_CHARS current]}      )
    )
  )
  (FunctionDef check_cache_at []
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('clean_if_empty', {[ComSub (Com {[LIT_CHARS git]} {[LIT_CHARS diff-files]} {[LIT_CHARS --]} {[DQ [VarSub 1]]})]})])
      (Case to_match={[DQ [VarSub clean_if_empty]]}, pat_word_list=[[{[SQ ]}], [{[LIT_OTHER "?"] [LIT_OTHER "*"]}]]
        (Com {[LIT_CHARS echo]} {[DQ [VarSub 1][LIT_CHARS ": clean"]]}        )
        (Com {[LIT_CHARS echo]} {[DQ [VarSub 1][LIT_CHARS ": dirty"]]}        )
      )
      (Case to_match={[DQ [VarSub 2][LIT_CHARS ","][VarSub clean_if_empty]]}, pat_word_list=[[{[LIT_CHARS clean] [LIT_COMMA ","]}], [{[LIT_CHARS clean] [LIT_COMMA ","] [LIT_OTHER "?"] [LIT_OTHER "*"]}], [{[LIT_CHARS dirty] [LIT_COMMA ","]}], [{[LIT_CHARS dirty] [LIT_COMMA ","] [LIT_OTHER "?"] [LIT_OTHER "*"]}]]
        (Com {[LIT_OTHER ":"]}        )
        (Com {[LIT_CHARS false]}        )
        (Com {[LIT_CHARS false]}        )
        (Com {[LIT_OTHER ":"]}        )
      )
    )
  )
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS bozbar-old]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=False body_word={[LIT_CHARS "This is a sample file used in two-way fast-forward merge\n"] [LIT_CHARS "tests.  Its second line ends with a magic word bozbar\n"] [LIT_CHARS "which will be modified by the merged head to gnusto.\n"] [LIT_CHARS "It has some extra lines so that external tools can\n"] [LIT_CHARS "successfully merge independent changes made to later\n"] [LIT_CHARS "lines (such as this one), avoiding line conflicts.\n"]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "s/bozbar/gnusto (earlier bozbar)/">]} {[LIT_CHARS bozbar-old]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS bozbar-new]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS setup]} {[SQ <LIT_CHARS "echo frotz >frotz &&\n"> <LIT_CHARS "     echo nitfol >nitfol &&\n"> <LIT_CHARS "     cat bozbar-old >bozbar &&\n"> <LIT_CHARS "     echo rezrov >rezrov &&\n"> <LIT_CHARS "     echo yomin >yomin &&\n"> <LIT_CHARS "     git update-index --add nitfol bozbar rezrov &&\n"> <LIT_CHARS "     treeH=`git write-tree` &&\n"> <LIT_CHARS "     echo treeH $treeH &&\n"> <LIT_CHARS "     git ls-tree $treeH &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "     cat bozbar-new >bozbar &&\n"> <LIT_CHARS "     git update-index --add frotz bozbar --force-remove rezrov &&\n"> <LIT_CHARS "     git ls-files --stage >M.out &&\n"> <LIT_CHARS "     treeM=`git write-tree` &&\n"> <LIT_CHARS "     echo treeM $treeM &&\n"> <LIT_CHARS "     git ls-tree $treeM &&\n"> <LIT_CHARS "     git diff-tree $treeH $treeM">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "1, 2, 3 - no carry forward">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >1-3.out &&\n"> <LIT_CHARS "     test_cmp M.out 1-3.out &&\n"> <LIT_CHARS "     check_cache_at bozbar dirty &&\n"> <LIT_CHARS "     check_cache_at frotz dirty &&\n"> <LIT_CHARS "     check_cache_at nitfol dirty">]}  )
  (Com {[LIT_CHARS echo]} {[SQ <LIT_CHARS "+100644 X 0\tyomin">]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expected]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "4 - carry forward local addition.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     git update-index --add yomin &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >4.out &&\n"> <LIT_CHARS "     test_must_fail git diff --no-index M.out 4.out >4diff.out &&\n"> <LIT_CHARS "     compare_change 4diff.out expected &&\n"> <LIT_CHARS "     check_cache_at yomin clean">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "5 - carry forward local addition.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo yomin >yomin &&\n"> <LIT_CHARS "     git update-index --add yomin &&\n"> <LIT_CHARS "     echo yomin yomin >yomin &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >5.out &&\n"> <LIT_CHARS "     test_must_fail git diff --no-index M.out 5.out >5diff.out &&\n"> <LIT_CHARS "     compare_change 5diff.out expected &&\n"> <LIT_CHARS "     check_cache_at yomin dirty">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "6 - local addition already has the same.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     git update-index --add frotz &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >6.out &&\n"> <LIT_CHARS "     test_cmp M.out 6.out &&\n"> <LIT_CHARS "     check_cache_at frotz clean">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "7 - local addition already has the same.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo frotz >frotz &&\n"> <LIT_CHARS "     git update-index --add frotz &&\n"> <LIT_CHARS "     echo frotz frotz >frotz &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >7.out &&\n"> <LIT_CHARS "     test_cmp M.out 7.out &&\n"> <LIT_CHARS "     check_cache_at frotz dirty">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "8 - conflicting addition.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo frotz frotz >frotz &&\n"> <LIT_CHARS "     git update-index --add frotz &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "9 - conflicting addition.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo frotz frotz >frotz &&\n"> <LIT_CHARS "     git update-index --add frotz &&\n"> <LIT_CHARS "     echo frotz >frotz &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "10 - path removed.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo rezrov >rezrov &&\n"> <LIT_CHARS "     git update-index --add rezrov &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >10.out &&\n"> <LIT_CHARS "     test_cmp M.out 10.out">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "11 - dirty path removed.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo rezrov >rezrov &&\n"> <LIT_CHARS "     git update-index --add rezrov &&\n"> <LIT_CHARS "     echo rezrov rezrov >rezrov &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "12 - unmatching local changes being removed.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo rezrov rezrov >rezrov &&\n"> <LIT_CHARS "     git update-index --add rezrov &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "13 - unmatching local changes being removed.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo rezrov rezrov >rezrov &&\n"> <LIT_CHARS "     git update-index --add rezrov &&\n"> <LIT_CHARS "     echo rezrov >rezrov &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expected]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "-100644 X 0\tnitfol\n"][LIT_CHARS "+100644 X 0\tnitfol\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "14 - unchanged in two heads.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo nitfol nitfol >nitfol &&\n"> <LIT_CHARS "     git update-index --add nitfol &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >14.out &&\n"> <LIT_CHARS "     test_must_fail git diff --no-index M.out 14.out >14diff.out &&\n"> <LIT_CHARS "     compare_change 14diff.out expected &&\n"> <LIT_CHARS "     check_cache_at nitfol clean">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "15 - unchanged in two heads.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo nitfol nitfol >nitfol &&\n"> <LIT_CHARS "     git update-index --add nitfol &&\n"> <LIT_CHARS "     echo nitfol nitfol nitfol >nitfol &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >15.out &&\n"> <LIT_CHARS "     test_must_fail git diff --no-index M.out 15.out >15diff.out &&\n"> <LIT_CHARS "     compare_change 15diff.out expected &&\n"> <LIT_CHARS "     check_cache_at nitfol dirty">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "16 - conflicting local change.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo bozbar bozbar >bozbar &&\n"> <LIT_CHARS "     git update-index --add bozbar &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "17 - conflicting local change.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     echo bozbar bozbar >bozbar &&\n"> <LIT_CHARS "     git update-index --add bozbar &&\n"> <LIT_CHARS "     echo bozbar bozbar bozbar >bozbar &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "18 - local change already having a good result.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     cat bozbar-new >bozbar &&\n"> <LIT_CHARS "     git update-index --add bozbar &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >18.out &&\n"> <LIT_CHARS "     test_cmp M.out 18.out &&\n"> <LIT_CHARS "     check_cache_at bozbar clean">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "19 - local change already having a good result, further modified.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     cat bozbar-new >bozbar &&\n"> <LIT_CHARS "     git update-index --add bozbar &&\n"> <LIT_CHARS "     echo gnusto gnusto >bozbar &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >19.out &&\n"> <LIT_CHARS "     test_cmp M.out 19.out &&\n"> <LIT_CHARS "     check_cache_at bozbar dirty">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "20 - no local change, use new tree.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     cat bozbar-old >bozbar &&\n"> <LIT_CHARS "     git update-index --add bozbar &&\n"> <LIT_CHARS "     read_tree_twoway $treeH $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >20.out &&\n"> <LIT_CHARS "     test_cmp M.out 20.out &&\n"> <LIT_CHARS "     check_cache_at bozbar dirty">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "21 - no local change, dirty cache.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     cat bozbar-old >bozbar &&\n"> <LIT_CHARS "     git update-index --add bozbar &&\n"> <LIT_CHARS "     echo gnusto gnusto >bozbar &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "22 - local change cache updated.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     read_tree_must_succeed $treeH &&\n"> <LIT_CHARS "     git checkout-index -u -f -q -a &&\n"> <LIT_CHARS "     sed -e \"s/such as/SUCH AS/\" bozbar-old >bozbar &&\n"> <LIT_CHARS "     git update-index --add bozbar &&\n"> <LIT_CHARS "     if read_tree_twoway $treeH $treeM; then false; else :; fi">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "DF vs DF/DF case setup.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     echo DF >DF &&\n"> <LIT_CHARS "     git update-index --add DF &&\n"> <LIT_CHARS "     treeDF=`git write-tree` &&\n"> <LIT_CHARS "     echo treeDF $treeDF &&\n"> <LIT_CHARS "     git ls-tree $treeDF &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "     rm -f DF &&\n"> <LIT_CHARS "     mkdir DF &&\n"> <LIT_CHARS "     echo DF/DF >DF/DF &&\n"> <LIT_CHARS "     git update-index --add --remove DF DF/DF &&\n"> <LIT_CHARS "     treeDFDF=`git write-tree` &&\n"> <LIT_CHARS "     echo treeDFDF $treeDFDF &&\n"> <LIT_CHARS "     git ls-tree $treeDFDF &&\n"> <LIT_CHARS "     git ls-files --stage >DFDF.out">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "DF vs DF/DF case test.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     rm -fr DF &&\n"> <LIT_CHARS "     echo DF >DF &&\n"> <LIT_CHARS "     git update-index --add DF &&\n"> <LIT_CHARS "     read_tree_twoway $treeDF $treeDFDF &&\n"> <LIT_CHARS "     git ls-files --stage >DFDFcheck.out &&\n"> <LIT_CHARS "     test_cmp DFDF.out DFDFcheck.out &&\n"> <LIT_CHARS "     check_cache_at DF/DF dirty &&\n"> <LIT_CHARS "     :">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "a/b (untracked) vs a case setup.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     : >a &&\n"> <LIT_CHARS "     git update-index --add a &&\n"> <LIT_CHARS "     treeM=`git write-tree` &&\n"> <LIT_CHARS "     echo treeM $treeM &&\n"> <LIT_CHARS "     git ls-tree $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >treeM.out &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "     rm -f a &&\n"> <LIT_CHARS "     git update-index --remove a &&\n"> <LIT_CHARS "     mkdir a &&\n"> <LIT_CHARS "     : >a/b &&\n"> <LIT_CHARS "     treeH=`git write-tree` &&\n"> <LIT_CHARS "     echo treeH $treeH &&\n"> <LIT_CHARS "     git ls-tree $treeH">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "a/b (untracked) vs a, plus c/d case test.">]} {[SQ <LIT_CHARS "read_tree_u_must_fail -u -m \"$treeH\" \"$treeM\" &&\n"> <LIT_CHARS "     git ls-files --stage &&\n"> <LIT_CHARS "     test -f a/b">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "a/b vs a, plus c/d case setup.">]} {[SQ <LIT_CHARS "rm -f .git/index &&\n"> <LIT_CHARS "     rm -fr a &&\n"> <LIT_CHARS "     : >a &&\n"> <LIT_CHARS "     mkdir c &&\n"> <LIT_CHARS "     : >c/d &&\n"> <LIT_CHARS "     git update-index --add a c/d &&\n"> <LIT_CHARS "     treeM=`git write-tree` &&\n"> <LIT_CHARS "     echo treeM $treeM &&\n"> <LIT_CHARS "     git ls-tree $treeM &&\n"> <LIT_CHARS "     git ls-files --stage >treeM.out &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "     rm -f a &&\n"> <LIT_CHARS "     mkdir a &&\n"> <LIT_CHARS "     : >a/b &&\n"> <LIT_CHARS "     git update-index --add --remove a a/b &&\n"> <LIT_CHARS "     treeH=`git write-tree` &&\n"> <LIT_CHARS "     echo treeH $treeH &&\n"> <LIT_CHARS "     git ls-tree $treeH">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "a/b vs a, plus c/d case test.">]} {[SQ <LIT_CHARS "read_tree_u_must_succeed -u -m \"$treeH\" \"$treeM\" &&\n"> <LIT_CHARS "     git ls-files --stage | tee >treeMcheck.out &&\n"> <LIT_CHARS "     test_cmp treeM.out treeMcheck.out">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "-m references the correct modified tree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo >file-a &&\n"> <LIT_CHARS "\techo >file-b &&\n"> <LIT_CHARS "\tgit add file-a file-b &&\n"> <LIT_CHARS "\tgit commit -a -m \"test for correct modified tree\" &&\n"> <LIT_CHARS "\tgit branch initial-mod &&\n"> <LIT_CHARS "\techo b >file-b &&\n"> <LIT_CHARS "\tgit commit -a -m \"B\" &&\n"> <LIT_CHARS "\techo a >file-a &&\n"> <LIT_CHARS "\tgit add file-a &&\n"> <LIT_CHARS "\tgit ls-tree $(git write-tree) file-a >expect &&\n"> <LIT_CHARS "\tread_tree_must_succeed -m HEAD initial-mod &&\n"> <LIT_CHARS "\tgit ls-tree $(git write-tree) file-a >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)