(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "Basic porcelain support for subtrees\n"> <LIT_CHARS "\n"> <LIT_CHARS "This test verifies the basic operation of the add, pull, merge\n"> <LIT_CHARS "and split subcommands of git subtree.\n">]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('TEST_DIRECTORY', {[ComSub (Com {[LIT_CHARS pwd]})] [LIT_CHARS /../../../t]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=1 words=[{[LIT_CHARS TEST_DIRECTORY]}] bindings=[])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ../../../t/test-lib.sh]})
  (FunctionDef subtree_test_create_repo []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS test_create_repo]} {[DQ [VarSub 1]]})
      (Subshell
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS cd]} {[DQ [VarSub 1]]})
          (Com {[LIT_CHARS git]} {[LIT_CHARS config]} {[LIT_CHARS log.date]} {[LIT_CHARS relative]})
        )
      )
    )
  )
  (FunctionDef create []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS echo]} {[DQ [VarSub 1]]}
        <
        (FilenameRedirectNode filename={[DQ [VarSub 1]]} <REDIR_GREAT ">"> 1),
        >
      )
      (Com {[LIT_CHARS git]} {[LIT_CHARS add]} {[DQ [VarSub 1]]})
    )
  )
  (FunctionDef check_equal []
    (List
      (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS echo>]})
      (Com {[LIT_CHARS test_debug]} {[DQ [LIT_CHARS "echo "][\ LIT_ESCAPED_CHAR "\\\""][LIT_CHARS "check a:"][\ LIT_ESCAPED_CHAR "\\\""][LIT_CHARS " "][\ LIT_ESCAPED_CHAR "\\\""][LIT_CHARS "{"][VarSub 1][LIT_CHARS "}"][\ LIT_ESCAPED_CHAR "\\\""]]})
      (Com {[LIT_CHARS test_debug]} {[DQ [LIT_CHARS "echo "][\ LIT_ESCAPED_CHAR "\\\""][LIT_CHARS "      b:"][\ LIT_ESCAPED_CHAR "\\\""][LIT_CHARS " "][\ LIT_ESCAPED_CHAR "\\\""][LIT_CHARS "{"][VarSub 2][LIT_CHARS "}"][\ LIT_ESCAPED_CHAR "\\\""]]})
      (If
        (Com {[LIT_OTHER "["]} {[DQ [VarSub 1]]} {[LIT_OTHER "="]} {[DQ [VarSub 2]]} {[LIT_OTHER "]"]})
        (Com {[LIT_CHARS return]} {[LIT_CHARS 0]})
        (ElseTrue)
        (Com {[LIT_CHARS return]} {[LIT_CHARS 1]})
      )
    )
  )
  (FunctionDef undo []
    (Com {[LIT_CHARS git]} {[LIT_CHARS reset]} {[LIT_CHARS --hard]} {[LIT_CHARS HEAD] [LIT_TILDE "~"]})
  )
  (FunctionDef join_commits []
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('commit', {[SQ ]})])
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('all', {[SQ ]})])
      (While
        (Com {[LIT_CHARS read]} {[LIT_CHARS x]} {[LIT_CHARS y]})
        (If
          (Com {[LIT_OTHER "["]} {[LIT_CHARS -z]} {[DQ [VarSub x]]} {[LIT_OTHER "]"]})
          (Com {[LIT_CHARS continue]})
          (Com {[LIT_OTHER "["]} {[DQ [VarSub x]]} {[LIT_OTHER "="]} {[DQ [LIT_CHARS "commit:"]]} {[LIT_OTHER "]"]})
          (List
            (If
              (Com {[LIT_OTHER "["]} {[LIT_CHARS -n]} {[DQ [VarSub commit]]} {[LIT_OTHER "]"]})
              (List
                (Com {[LIT_CHARS echo]} {[DQ [VarSub commit][LIT_CHARS " "][VarSub all]]})
                (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('all', {[SQ ]})])
              )
            )
            (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('commit', {[DQ [VarSub y]]})])
          )
          (ElseTrue)
          (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('all', {[DQ [VarSub all][LIT_CHARS " "][VarSub y]]})])
        )
      )
      (Com {[LIT_CHARS echo]} {[DQ [VarSub commit][LIT_CHARS " "][VarSub all]]})
    )
  )
  (FunctionDef test_create_commit []
    (Subshell
      (List
        (AndOr OP_AND_IF
          (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('repo', {[VarSub 1]})])
          (AndOr OP_AND_IF
            (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('commit', {[VarSub 2]})])
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS cd]} {[DQ [VarSub repo]]})
              (AndOr OP_OR_IF
                (Com {[LIT_CHARS mkdir]} {[LIT_CHARS -p]} {[DQ [ComSub (Com {[LIT_CHARS dirname]} {[DQ [VarSub commit]]})]]})
                (Com {[LIT_CHARS error]} {[DQ [LIT_CHARS "Could not create directory for commit"]]})
              )
            )
          )
        )
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS echo]} {[DQ [VarSub commit]]}
            <
            (FilenameRedirectNode filename={[DQ [VarSub commit]]} <REDIR_GREAT ">"> 1),
            >
          )
          (AndOr OP_OR_IF
            (Com {[LIT_CHARS git]} {[LIT_CHARS add]} {[DQ [VarSub commit]]})
            (Com {[LIT_CHARS error]} {[DQ [LIT_CHARS "Could not add commit"]]})
          )
        )
        (AndOr OP_OR_IF
          (Com {[LIT_CHARS git]} {[LIT_CHARS commit]} {[LIT_CHARS -m]} {[DQ [VarSub commit]]})
          (Com {[LIT_CHARS error]} {[DQ [LIT_CHARS "Could not commit"]]})
        )
      )
    )
  )
  (FunctionDef last_commit_message []
    (Com {[LIT_CHARS git]} {[LIT_CHARS log]} {[LIT_CHARS --pretty] [LIT_OTHER "="] [LIT_CHARS format] [LIT_OTHER ":"] [LIT_OTHER "%"] [LIT_CHARS s]} {[LIT_CHARS -1]})
  )
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('subtree_test_count', {[LIT_CHARS 0]})])
  (FunctionDef next_test []
    (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('subtree_test_count', {[ArithSub {A2 AS_OP_PLUS {A Atom NODE_ARITH_WORD {[VarSub subtree_test_count]}} {A Atom NODE_ARITH_WORD {[AS_NUM_LITERAL 1]}}}]})])
  )
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "no merge from non-existent subtree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\ttest_must_fail git subtree merge --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "no pull from non-existent subtree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\ttest_must_fail git subtree pull --prefix=\"sub dir\" ./\"sub proj\" master\n"> <LIT_CHARS "\t)">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "add subproj as subtree into sub dir/ with --prefix">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Add ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "sub dir/">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS " from commit ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "$(git rev-parse FETCH_HEAD)">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "add subproj as subtree into sub dir/ with --prefix and --message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" --message=\"Added subproject\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Added subproject\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "add subproj as subtree into sub dir/ with --prefix as -P and --message as -m">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add -P \"sub dir\" -m \"Added subproject\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Added subproject\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "add subproj as subtree into sub dir/ with --squash and --prefix and --message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" --message=\"Added subproject with squash\" --squash FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Added subproject with squash\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge new subproj history into sub dir/ with --prefix">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Merge commit ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "$(git rev-parse FETCH_HEAD)">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge new subproj history into sub dir/ with --prefix and --message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" --message=\"Merged changes from subproject\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Merged changes from subproject\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge new subproj history into sub dir/ with --squash and --prefix and --message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" --message=\"Merged changes from subproject using squash\" --squash FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Merged changes from subproject using squash\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge the added subproj again, should do nothing">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\t# this shouldn not actually do anything, since FETCH_HEAD\n"> <LIT_CHARS "\t\t# is already a parent\n"> <LIT_CHARS "\t\tresult=$(git merge -s ours -m \"merge -s -ours\" FETCH_HEAD) &&\n"> <LIT_CHARS "\t\tcheck_equal \"${result}\" \"Already up-to-date.\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge new subproj history into subdir/ with a slash appended to the argument of --prefix">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_create_repo \"$test_count\" &&\n"> <LIT_CHARS "\ttest_create_repo \"$test_count/subproj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$test_count/subproj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./subproj master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=subdir/ FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$test_count/subproj\" sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./subproj master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=subdir/ FETCH_HEAD &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Merge commit ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "$(git rev-parse FETCH_HEAD)">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split requires option --prefix">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\techo \"You must provide the --prefix option.\" > expected &&\n"> <LIT_CHARS "\t\ttest_must_fail git subtree split > actual 2>&1 &&\n"> <LIT_CHARS "\t\ttest_debug \"printf ">] [DQ [LIT_CHARS "expected: "]] [SQ <LIT_CHARS "\" &&\n"> <LIT_CHARS "\t\ttest_debug \"cat expected\" &&\n"> <LIT_CHARS "\t\ttest_debug \"printf ">] [DQ [LIT_CHARS "actual: "]] [SQ <LIT_CHARS "\" &&\n"> <LIT_CHARS "\t\ttest_debug \"cat actual\" &&\n"> <LIT_CHARS "\t\ttest_cmp expected actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split requires path given by option --prefix must exist">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\techo \"">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS non-existent-directory>] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS " does not exist; use ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "git subtree add">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\" > expected &&\n"> <LIT_CHARS "\t\ttest_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 &&\n"> <LIT_CHARS "\t\ttest_debug \"printf ">] [DQ [LIT_CHARS "expected: "]] [SQ <LIT_CHARS "\" &&\n"> <LIT_CHARS "\t\ttest_debug \"cat expected\" &&\n"> <LIT_CHARS "\t\ttest_debug \"printf ">] [DQ [LIT_CHARS "actual: "]] [SQ <LIT_CHARS "\" &&\n"> <LIT_CHARS "\t\ttest_debug \"cat actual\" &&\n"> <LIT_CHARS "\t\ttest_cmp expected actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split sub dir/ with --rejoin">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tsplit_hash=$(git subtree split --prefix=\"sub dir\" --annotate=\"*\") &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --rejoin &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Split ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "sub dir/">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS " into commit ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "$split_hash">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\"\n"> <LIT_CHARS "\t)\n"> <LIT_CHARS " ">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split sub dir/ with --rejoin from scratch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tmkdir \"sub dir\" &&\n"> <LIT_CHARS "\t\techo file >\"sub dir\"/file &&\n"> <LIT_CHARS "\t\tgit add \"sub dir/file\" &&\n"> <LIT_CHARS "\t\tgit commit -m\"sub dir file\" &&\n"> <LIT_CHARS "\t\tsplit_hash=$(git subtree split --prefix=\"sub dir\" --rejoin) &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --rejoin &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Split ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "sub dir/">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS " into commit ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "$split_hash">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\"\n"> <LIT_CHARS "\t)\n"> <LIT_CHARS " ">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split sub dir/ with --rejoin and --message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --message=\"Split & rejoin\" --annotate=\"*\" --rejoin &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(last_commit_message)\" \"Split & rejoin\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split \"sub dir\"/ with --branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tsplit_hash=$(git subtree split --prefix=\"sub dir\" --annotate=\"*\") &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(git rev-parse subproj-br)\" \"$split_hash\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check hash of split">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tsplit_hash=$(git subtree split --prefix=\"sub dir\" --annotate=\"*\") &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(git rev-parse subproj-br)\" \"$split_hash\" &&\n"> <LIT_CHARS "\t\t# Check hash of split\n"> <LIT_CHARS "\t\tnew_hash=$(git rev-parse subproj-br^2) &&\n"> <LIT_CHARS "\t\t(\n"> <LIT_CHARS "\t\t\tcd ./\"sub proj\" &&\n"> <LIT_CHARS "\t\t\tsubdir_hash=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\t\tcheck_equal ">] [SQ <LIT_CHARS "\"$new_hash\"">] [SQ <LIT_CHARS " \"$subdir_hash\"\n"> <LIT_CHARS "\t\t)\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split \"sub dir\"/ with --branch for an existing branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit branch subproj-br FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tsplit_hash=$(git subtree split --prefix=\"sub dir\" --annotate=\"*\") &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(git rev-parse subproj-br)\" \"$split_hash\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split \"sub dir\"/ with --branch for an incompatible branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit branch init HEAD &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\ttest_must_fail git subtree split --prefix=\"sub dir\" --branch init\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make sure exactly the right set of files ends up in the subproj">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub3 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub3 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tchks=\"sub1\n"> <LIT_CHARS "sub2\n"> <LIT_CHARS "sub3\n"> <LIT_CHARS "sub4\" &&\n"> <LIT_CHARS "\t\tchks_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chks\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\t\tchkms=\"main-sub1\n"> <LIT_CHARS "main-sub2\n"> <LIT_CHARS "main-sub3\n"> <LIT_CHARS "main-sub4\" &&\n"> <LIT_CHARS "\t\tchkms_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chkms\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tsubfiles=$(git ls-files) &&\n"> <LIT_CHARS "\t\tcheck_equal \"$subfiles\" \"$chkms\n"> <LIT_CHARS "$chks\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make sure the subproj *only* contains commits that affect the \"sub dir\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub3 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub3 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tchks=\"sub1\n"> <LIT_CHARS "sub2\n"> <LIT_CHARS "sub3\n"> <LIT_CHARS "sub4\" &&\n"> <LIT_CHARS "\t\tchks_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chks\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\t\tchkms=\"main-sub1\n"> <LIT_CHARS "main-sub2\n"> <LIT_CHARS "main-sub3\n"> <LIT_CHARS "main-sub4\" &&\n"> <LIT_CHARS "\t\tchkms_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chkms\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\t\tallchanges=$(git log --name-only --pretty=format:\"\" | sort | sed \"/^$/d\") &&\n"> <LIT_CHARS "\t\tcheck_equal \"$allchanges\" \"$chkms\n"> <LIT_CHARS "$chks\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make sure exactly the right set of files ends up in the mainline">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub3 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub3 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree pull --prefix=\"sub dir\" ./\"sub proj\" master &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tchkm=\"main1\n"> <LIT_CHARS "main2\" &&\n"> <LIT_CHARS "\t\tchks=\"sub1\n"> <LIT_CHARS "sub2\n"> <LIT_CHARS "sub3\n"> <LIT_CHARS "sub4\" &&\n"> <LIT_CHARS "\t\tchks_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chks\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\t\tchkms=\"main-sub1\n"> <LIT_CHARS "main-sub2\n"> <LIT_CHARS "main-sub3\n"> <LIT_CHARS "main-sub4\" &&\n"> <LIT_CHARS "\t\tchkms_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chkms\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\t\tmainfiles=$(git ls-files) &&\n"> <LIT_CHARS "\t\tcheck_equal \"$mainfiles\" \"$chkm\n"> <LIT_CHARS "$chkms_sub\n"> <LIT_CHARS "$chks_sub\"\n"> <LIT_CHARS ")\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make sure each filename changed exactly once in the entire history">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit config log.date relative\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub3 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub3 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree pull --prefix=\"sub dir\" ./\"sub proj\" master &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tchkm=\"main1\n"> <LIT_CHARS "main2\" &&\n"> <LIT_CHARS "\t\tchks=\"sub1\n"> <LIT_CHARS "sub2\n"> <LIT_CHARS "sub3\n"> <LIT_CHARS "sub4\" &&\n"> <LIT_CHARS "\t\tchks_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chks\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\t\tchkms=\"main-sub1\n"> <LIT_CHARS "main-sub2\n"> <LIT_CHARS "main-sub3\n"> <LIT_CHARS "main-sub4\" &&\n"> <LIT_CHARS "\t\tchkms_sub=$(cat <<TXT | sed ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s,^,sub dir/,">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "\n"> <LIT_CHARS "$chkms\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ") &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# main-sub?? and /\"sub dir\"/main-sub?? both change, because those are the\n"> <LIT_CHARS "\t\t# changes that were split into their own history.  And \"sub dir\"/sub?? never\n"> <LIT_CHARS "\t\t# change, since they were *only* changed in the subtree branch.\n"> <LIT_CHARS "\t\tallchanges=$(git log --name-only --pretty=format:\"\" | sort | sed \"/^$/d\") &&\n"> <LIT_CHARS "\t\texpected=">] [SQ <LIT_CHARS "\"$(cat <<TXT | sort\n"> <LIT_CHARS "$chkms\n"> <LIT_CHARS "$chkm\n"> <LIT_CHARS "$chks\n"> <LIT_CHARS "$chkms_sub\n"> <LIT_CHARS "TXT\n"> <LIT_CHARS ")\"">] [SQ <LIT_CHARS " &&\n"> <LIT_CHARS "\t\tcheck_equal \"$allchanges\" \"$expected\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make sure the --rejoin commits never make it into subproj">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub3 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub3 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree pull --prefix=\"sub dir\" ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(git log --pretty=format:\"%s\" HEAD^2 | grep -i split)\" \"\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make sure no \"git subtree\" tagged commits make it into subproj">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub3 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub3 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\t git merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub4 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --annotate=\"*\" --branch subproj-br --rejoin\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\t\tgit fetch .. subproj-br &&\n"> <LIT_CHARS "\t\tgit merge FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree pull --prefix=\"sub dir\" ./\"sub proj\" master &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# They are meaningless to subproj since one side of the merge refers to the mainline\n"> <LIT_CHARS "\t\tcheck_equal \"$(git log --pretty=format:\"%s%n%b\" HEAD^2 | grep \"git-subtree.*:\")\" \"\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make sure \"git subtree split\" find the correct parent">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit branch subproj-ref FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --branch subproj-br &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# at this point, the new commit parent should be subproj-ref, if it is\n"> <LIT_CHARS "\t\t# not, something went wrong (the \"newparent\" of \"master~\" commit should\n"> <LIT_CHARS "\t\t# have been sub2, but it was not, because its cache was not set to\n"> <LIT_CHARS "\t\t# itself)\n"> <LIT_CHARS "\t\tcheck_equal \"$(git log --pretty=format:%P -1 subproj-br)\" \"$(git rev-parse subproj-ref)\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "split a new subtree without --onto option">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --branch subproj-br\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tmkdir \"$subtree_test_count\"/\"sub dir2\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir2\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# also test that we still can split out an entirely new subtree\n"> <LIT_CHARS "\t\t# if the parent of the first commit in the tree is not empty,\n"> <LIT_CHARS "\t\t# then the new subtree has accidentally been attached to something\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir2\" --branch subproj2-br &&\n"> <LIT_CHARS "\t\tcheck_equal \"$(git log --pretty=format:%P -1 subproj2-br)\" \"\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "verify one file change per commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit branch sub1 FETCH_HEAD &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" sub1\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir\" --branch subproj-br\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tmkdir \"$subtree_test_count\"/\"sub dir2\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir2\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix=\"sub dir2\" --branch subproj2-br &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tx= &&\n"> <LIT_CHARS "\t\tgit log --pretty=format:\"commit: %H\" | join_commits |\n"> <LIT_CHARS "\t\t(\n"> <LIT_CHARS "\t\t\twhile read commit a b; do\n"> <LIT_CHARS "\t\t\t\ttest_debug \"echo Verifying commit $commit\"\n"> <LIT_CHARS "\t\t\t\ttest_debug \"echo a: $a\"\n"> <LIT_CHARS "\t\t\t\ttest_debug \"echo b: $b\"\n"> <LIT_CHARS "\t\t\t\tcheck_equal \"$b\" \"\"\n"> <LIT_CHARS "\t\t\t\tx=1\n"> <LIT_CHARS "\t\t\tdone\n"> <LIT_CHARS "\t\t\tcheck_equal \"$x\" 1\n"> <LIT_CHARS "\t\t)\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "push split to subproj">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count/sub proj\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub1 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree add --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub1 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" main2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count/sub proj\" sub2 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub2 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd $subtree_test_count/\"sub proj\" &&\n"> <LIT_CHARS "                git branch sub-branch-1 &&\n"> <LIT_CHARS "                cd .. &&\n"> <LIT_CHARS "\t\tgit fetch ./\"sub proj\" master &&\n"> <LIT_CHARS "\t\tgit subtree merge --prefix=\"sub dir\" FETCH_HEAD\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" \"sub dir\"/main-sub3 &&\n"> <LIT_CHARS "        (\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t        git subtree push ./\"sub proj\" --prefix \"sub dir\" sub-branch-1 &&\n"> <LIT_CHARS "                cd ./\"sub proj\" &&\n"> <LIT_CHARS "                git checkout sub-branch-1 &&\n"> <LIT_CHARS "         \tcheck_equal \"$(last_commit_message)\" \"sub dir/main-sub3\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS next_test]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "subtree descendant check">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tsubtree_test_create_repo \"$subtree_test_count\" &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" folder_subtree/a &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit branch branch\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" folder_subtree/0 &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" folder_subtree/b &&\n"> <LIT_CHARS "\tcherry=$(cd \"$subtree_test_count\"; git rev-parse HEAD) &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit checkout branch\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" commit_on_branch &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit cherry-pick $cherry &&\n"> <LIT_CHARS "\t\tgit checkout master &&\n"> <LIT_CHARS "\t\tgit merge -m \"merge should be kept on subtree\" branch &&\n"> <LIT_CHARS "\t\tgit branch no_subtree_work_branch\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" folder_subtree/d &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit checkout no_subtree_work_branch\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_create_commit \"$subtree_test_count\" not_a_subtree_change &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$subtree_test_count\" &&\n"> <LIT_CHARS "\t\tgit checkout master &&\n"> <LIT_CHARS "\t\tgit merge -m \"merge should be skipped on subtree\" no_subtree_work_branch &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit subtree split --prefix folder_subtree/ --branch subtree_tip master &&\n"> <LIT_CHARS "\t\tgit subtree split --prefix folder_subtree/ --branch subtree_branch branch &&\n"> <LIT_CHARS "\t\tcheck_equal $(git rev-list --count subtree_tip..subtree_branch) 0\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_done]})
)