(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git status --porcelain=v2\n"> <LIT_CHARS "\n"> <LIT_CHARS "This test exercises porcelain V2 output for git status.">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS setup]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit config core.autocrlf false &&\n"> <LIT_CHARS "\techo x >file_x &&\n"> <LIT_CHARS "\techo y >file_y &&\n"> <LIT_CHARS "\techo z >file_z &&\n"> <LIT_CHARS "\tmkdir dir1 &&\n"> <LIT_CHARS "\techo a >dir1/file_a &&\n"> <LIT_CHARS "\techo b >dir1/file_b\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "before initial commit, nothing added, only untracked">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid (initial)\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? dir1/\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\t? file_x\n"> <LIT_CHARS "\t? file_y\n"> <LIT_CHARS "\t? file_z\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=normal >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "before initial commit, things added">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit add file_x file_y file_z dir1 &&\n"> <LIT_CHARS "\tOID_A=$(git hash-object -t blob -- dir1/file_a) &&\n"> <LIT_CHARS "\tOID_B=$(git hash-object -t blob -- dir1/file_b) &&\n"> <LIT_CHARS "\tOID_X=$(git hash-object -t blob -- file_x) &&\n"> <LIT_CHARS "\tOID_Y=$(git hash-object -t blob -- file_y) &&\n"> <LIT_CHARS "\tOID_Z=$(git hash-object -t blob -- file_z) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid (initial)\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_A dir1/file_a\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_B dir1/file_b\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_X file_x\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_Y file_y\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_Z file_z\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "before initial commit, things added (-z)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tlf_to_nul >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid (initial)\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_A dir1/file_a\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_B dir1/file_b\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_X file_x\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_Y file_y\n"> <LIT_CHARS "\t1 A. N... 000000 100644 100644 $_z40 $OID_Z file_z\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status -z --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make first commit, comfirm HEAD oid and branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\tH0=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $H0\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "after first commit, create unstaged changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo x >>file_x &&\n"> <LIT_CHARS "\tOID_X1=$(git hash-object -t blob -- file_x) &&\n"> <LIT_CHARS "\trm file_z &&\n"> <LIT_CHARS "\tH0=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $H0\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t1 .M N... 100644 100644 100644 $OID_X $OID_X file_x\n"> <LIT_CHARS "\t1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "after first commit but omit untracked files and branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t1 .M N... 100644 100644 100644 $OID_X $OID_X file_x\n"> <LIT_CHARS "\t1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --untracked-files=no >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "after first commit, stage existing changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit add file_x &&\n"> <LIT_CHARS "\tgit rm file_z &&\n"> <LIT_CHARS "\tH0=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $H0\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x\n"> <LIT_CHARS "\t1 D. N... 100644 000000 000000 $OID_Z $_z40 file_z\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rename causes 2 path lines">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit mv file_y renamed_y &&\n"> <LIT_CHARS "\tH0=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tq_to_tab >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $H0\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x\n"> <LIT_CHARS "\t1 D. N... 100644 000000 000000 $OID_Z $_z40 file_z\n"> <LIT_CHARS "\t2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rename causes 2 path lines (-z)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tH0=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t## Lines use NUL path separator and line terminator, so double transform here.\n"> <LIT_CHARS "\tq_to_nul <<-EOF | lf_to_nul >expect &&\n"> <LIT_CHARS "\t# branch.oid $H0\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x\n"> <LIT_CHARS "\t1 D. N... 100644 000000 000000 $OID_Z $_z40 file_z\n"> <LIT_CHARS "\t2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all -z >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make second commit, confirm clean and new HEAD oid">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit commit -m second &&\n"> <LIT_CHARS "\tH1=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $H1\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "confirm ignored files are not printed">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"rm -f x.ign .gitignore\" &&\n"> <LIT_CHARS "\techo x.ign >.gitignore &&\n"> <LIT_CHARS "\techo \"ignore me\" >x.ign &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t? .gitignore\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "ignored files are printed with --ignored">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"rm -f x.ign .gitignore\" &&\n"> <LIT_CHARS "\techo x.ign >.gitignore &&\n"> <LIT_CHARS "\techo \"ignore me\" >x.ign &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t? .gitignore\n"> <LIT_CHARS "\t? actual\n"> <LIT_CHARS "\t? expect\n"> <LIT_CHARS "\t! x.ign\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --ignored --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "create and commit permanent ignore file">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcat >.gitignore <<-EOF &&\n"> <LIT_CHARS "\tactual*\n"> <LIT_CHARS "\texpect*\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit add .gitignore &&\n"> <LIT_CHARS "\tgit commit -m ignore_trash &&\n"> <LIT_CHARS "\tH1=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $H1\n"> <LIT_CHARS "\t# branch.head master\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "verify --intent-to-add output">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"git rm -f intent1.add intent2.add\" &&\n"> <LIT_CHARS "\ttouch intent1.add &&\n"> <LIT_CHARS "\techo test >intent2.add &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit add --intent-to-add intent1.add intent2.add &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t1 .A N... 000000 000000 100644 $_z40 $_z40 intent1.add\n"> <LIT_CHARS "\t1 .A N... 000000 000000 100644 $_z40 $_z40 intent2.add\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "verify AA (add-add) conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"git reset --hard\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch AA_A master &&\n"> <LIT_CHARS "\tgit checkout AA_A &&\n"> <LIT_CHARS "\techo \"Branch AA_A\" >conflict.txt &&\n"> <LIT_CHARS "\tOID_AA_A=$(git hash-object -t blob -- conflict.txt) &&\n"> <LIT_CHARS "\tgit add conflict.txt &&\n"> <LIT_CHARS "\tgit commit -m \"branch aa_a\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch AA_B master &&\n"> <LIT_CHARS "\tgit checkout AA_B &&\n"> <LIT_CHARS "\techo \"Branch AA_B\" >conflict.txt &&\n"> <LIT_CHARS "\tOID_AA_B=$(git hash-object -t blob -- conflict.txt) &&\n"> <LIT_CHARS "\tgit add conflict.txt &&\n"> <LIT_CHARS "\tgit commit -m \"branch aa_b\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch AA_M AA_B &&\n"> <LIT_CHARS "\tgit checkout AA_M &&\n"> <LIT_CHARS "\ttest_must_fail git merge AA_A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tHM=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $HM\n"> <LIT_CHARS "\t# branch.head AA_M\n"> <LIT_CHARS "\tu AA N... 000000 100644 100644 100644 $_z40 $OID_AA_B $OID_AA_A conflict.txt\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "verify UU (edit-edit) conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"git reset --hard\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch UU_ANC master &&\n"> <LIT_CHARS "\tgit checkout UU_ANC &&\n"> <LIT_CHARS "\techo \"Ancestor\" >conflict.txt &&\n"> <LIT_CHARS "\tOID_UU_ANC=$(git hash-object -t blob -- conflict.txt) &&\n"> <LIT_CHARS "\tgit add conflict.txt &&\n"> <LIT_CHARS "\tgit commit -m \"UU_ANC\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch UU_A UU_ANC &&\n"> <LIT_CHARS "\tgit checkout UU_A &&\n"> <LIT_CHARS "\techo \"Branch UU_A\" >conflict.txt &&\n"> <LIT_CHARS "\tOID_UU_A=$(git hash-object -t blob -- conflict.txt) &&\n"> <LIT_CHARS "\tgit add conflict.txt &&\n"> <LIT_CHARS "\tgit commit -m \"branch uu_a\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch UU_B UU_ANC &&\n"> <LIT_CHARS "\tgit checkout UU_B &&\n"> <LIT_CHARS "\techo \"Branch UU_B\" >conflict.txt &&\n"> <LIT_CHARS "\tOID_UU_B=$(git hash-object -t blob -- conflict.txt) &&\n"> <LIT_CHARS "\tgit add conflict.txt &&\n"> <LIT_CHARS "\tgit commit -m \"branch uu_b\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch UU_M UU_B &&\n"> <LIT_CHARS "\tgit checkout UU_M &&\n"> <LIT_CHARS "\ttest_must_fail git merge UU_A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tHM=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t# branch.oid $HM\n"> <LIT_CHARS "\t# branch.head UU_M\n"> <LIT_CHARS "\tu UU N... 100644 100644 100644 100644 $OID_UU_ANC $OID_UU_B $OID_UU_A conflict.txt\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "verify upstream fields in branch header">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\ttest_when_finished \"rm -rf sub_repo\" &&\n"> <LIT_CHARS "\tgit clone . sub_repo &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\t## Confirm local master tracks remote master.\n"> <LIT_CHARS "\t\tcd sub_repo &&\n"> <LIT_CHARS "\t\tHUF=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HUF\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +0 -0\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t## Test ahead/behind.\n"> <LIT_CHARS "\t\techo xyz >file_xyz &&\n"> <LIT_CHARS "\t\tgit add file_xyz &&\n"> <LIT_CHARS "\t\tgit commit -m xyz &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHUF=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HUF\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +1 -0\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t## Repeat the above but without --branch.\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t## Test upstream-gone case. Fake this by pointing origin/master at\n"> <LIT_CHARS "\t\t## a non-existing commit.\n"> <LIT_CHARS "\t\tOLD=$(git rev-parse origin/master) &&\n"> <LIT_CHARS "\t\tNEW=$_z40 &&\n"> <LIT_CHARS "\t\tmv .git/packed-refs .git/old-packed-refs &&\n"> <LIT_CHARS "\t\tsed \"s/$OLD/$NEW/g\" <.git/old-packed-refs >.git/packed-refs &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHUF=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HUF\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "create and add submodule, submodule appears clean (A. S...)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tgit clone . sub_repo &&\n"> <LIT_CHARS "\tgit clone . super_repo &&\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\tgit submodule add ../sub_repo sub1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t## Confirm stage/add of clean submodule.\n"> <LIT_CHARS "\t\tHMOD=$(git hash-object -t blob -- .gitmodules) &&\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\tHSUB=$HSUP &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +0 -0\n"> <LIT_CHARS "\t\t1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules\n"> <LIT_CHARS "\t\t1 A. S... 000000 160000 160000 $_z40 $HSUB sub1\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "untracked changes in added submodule (AM S..U)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\t## create untracked file in the submodule.\n"> <LIT_CHARS "\t\t(\tcd sub1 &&\n"> <LIT_CHARS "\t\t\techo \"xxxx\" >file_in_sub\n"> <LIT_CHARS "\t\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHMOD=$(git hash-object -t blob -- .gitmodules) &&\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\tHSUB=$HSUP &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +0 -0\n"> <LIT_CHARS "\t\t1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules\n"> <LIT_CHARS "\t\t1 AM S..U 000000 160000 160000 $_z40 $HSUB sub1\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "staged changes in added submodule (AM S.M.)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\t## stage the changes in the submodule.\n"> <LIT_CHARS "\t\t(\tcd sub1 &&\n"> <LIT_CHARS "\t\t\tgit add file_in_sub\n"> <LIT_CHARS "\t\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHMOD=$(git hash-object -t blob -- .gitmodules) &&\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\tHSUB=$HSUP &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +0 -0\n"> <LIT_CHARS "\t\t1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules\n"> <LIT_CHARS "\t\t1 AM S.M. 000000 160000 160000 $_z40 $HSUB sub1\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "staged and unstaged changes in added (AM S.M.)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\t(\tcd sub1 &&\n"> <LIT_CHARS "\t\t\t## make additional unstaged changes (on the same file) in the submodule.\n"> <LIT_CHARS "\t\t\t## This does not cause us to get S.MU (because the submodule does not report\n"> <LIT_CHARS "\t\t\t## a \"?\" line for the unstaged changes).\n"> <LIT_CHARS "\t\t\techo \"more changes\" >>file_in_sub\n"> <LIT_CHARS "\t\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHMOD=$(git hash-object -t blob -- .gitmodules) &&\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\tHSUB=$HSUP &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +0 -0\n"> <LIT_CHARS "\t\t1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules\n"> <LIT_CHARS "\t\t1 AM S.M. 000000 160000 160000 $_z40 $HSUB sub1\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "staged and untracked changes in added submodule (AM S.MU)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\t(\tcd sub1 &&\n"> <LIT_CHARS "\t\t\t## stage new changes in tracked file.\n"> <LIT_CHARS "\t\t\tgit add file_in_sub &&\n"> <LIT_CHARS "\t\t\t## create new untracked file.\n"> <LIT_CHARS "\t\t\techo \"yyyy\" >>another_file_in_sub\n"> <LIT_CHARS "\t\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHMOD=$(git hash-object -t blob -- .gitmodules) &&\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\tHSUB=$HSUP &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +0 -0\n"> <LIT_CHARS "\t\t1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules\n"> <LIT_CHARS "\t\t1 AM S.MU 000000 160000 160000 $_z40 $HSUB sub1\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "commit within the submodule appears as new commit in super (AM SC..)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\t(\tcd sub1 &&\n"> <LIT_CHARS "\t\t\t## Make a new commit in the submodule.\n"> <LIT_CHARS "\t\t\tgit add file_in_sub &&\n"> <LIT_CHARS "\t\t\trm -f another_file_in_sub &&\n"> <LIT_CHARS "\t\t\tgit commit -m \"new commit\"\n"> <LIT_CHARS "\t\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHMOD=$(git hash-object -t blob -- .gitmodules) &&\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\tHSUB=$HSUP &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +0 -0\n"> <LIT_CHARS "\t\t1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules\n"> <LIT_CHARS "\t\t1 AM SC.. 000000 160000 160000 $_z40 $HSUB sub1\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "stage submodule in super and commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\t## Stage the new submodule commit in the super.\n"> <LIT_CHARS "\t\tgit add sub1 &&\n"> <LIT_CHARS "\t\t## Commit the super so that the sub no longer appears as added.\n"> <LIT_CHARS "\t\tgit commit -m \"super commit\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +1 -0\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "make unstaged changes in existing submodule (.M S.M.)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\tcd super_repo &&\n"> <LIT_CHARS "\t\t(\tcd sub1 &&\n"> <LIT_CHARS "\t\t\techo \"zzzz\" >>file_in_sub\n"> <LIT_CHARS "\t\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tHSUP=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\t\tHSUB=$(cd sub1 && git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tcat >expect <<-EOF &&\n"> <LIT_CHARS "\t\t# branch.oid $HSUP\n"> <LIT_CHARS "\t\t# branch.head master\n"> <LIT_CHARS "\t\t# branch.upstream origin/master\n"> <LIT_CHARS "\t\t# branch.ab +1 -0\n"> <LIT_CHARS "\t\t1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit status --porcelain=v2 --branch --untracked-files=all >actual &&\n"> <LIT_CHARS "\t\ttest_cmp expect actual\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_done]})
)