This commit contains unit tests to exercise
the V2 porcelain status format.
Signed-off-by: Jeff Hostetler <jeffh...@microsoft.com>
---
t/t7064-wtstatus-pv2.sh | 461 ++++++++++++++++++++++++++++++++++++++++++++++++
t/t7501-commit.sh | 9 +
2 files changed, 470 insertions(+)
create mode 100755 t/t7064-wtstatus-pv2.sh
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
new file mode 100755
index 0000000..1f4252a
--- /dev/null
+++ b/t/t7064-wtstatus-pv2.sh
@@ -0,0 +1,461 @@
+#!/bin/sh
+
+test_description='git status --porcelain=2
+
+This test exercises porcelain V2 output for git status.'
+
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ test_tick &&
+ git config --local core.autocrlf false &&
+ echo x >file_x &&
+ echo y >file_y &&
+ echo z >file_z &&
+ mkdir dir1 &&
+ echo a >dir1/file_a &&
+ echo b >dir1/file_b
+'
+
+
+##################################################################
+## Confirm VVP output prior to initial commit.
+##################################################################
+
+test_expect_success pre_initial_commit_0 '
+ printf "## branch: (initial) master\n" >expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? dir1/\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+ printf "?? file_x\n" >>expected &&
+ printf "?? file_y\n" >>expected &&
+ printf "?? file_z\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=normal
>actual &&
+ test_cmp expected actual
+'
+
+
+test_expect_success pre_initial_commit_1 '
+ git add file_x file_y file_z dir1 &&
+ SHA_A=`git hash-object -t blob -- dir1/file_a` &&
+ SHA_B=`git hash-object -t blob -- dir1/file_b` &&
+ SHA_X=`git hash-object -t blob -- file_x` &&
+ SHA_Y=`git hash-object -t blob -- file_y` &&
+ SHA_Z=`git hash-object -t blob -- file_z` &&
+ SHA_ZERO=0000000000000000000000000000000000000000 &&
+ printf "## branch: (initial) master\n" >expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $SHA_A $SHA_ZERO R0
dir1/file_a\n" >>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $SHA_B $SHA_ZERO R0
dir1/file_b\n" >>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $SHA_X $SHA_ZERO R0
file_x\n" >>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $SHA_Y $SHA_ZERO R0
file_y\n" >>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $SHA_Z $SHA_ZERO R0
file_z\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ test_cmp expected actual
+'
+
+
+##################################################################
+## Create first commit. Confirm commit sha in new track header.
+## Then make some changes on top of it.
+##################################################################
+
+test_expect_success initial_commit_0 '
+ git commit -m initial &&
+ H0=`git rev-parse HEAD` &&
+ printf "## branch: $H0 master\n" >expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ test_cmp expected actual
+'
+
+
+test_expect_success initial_commit_1 '
+ echo x >>file_x &&
+ SHA_X1=`git hash-object -t blob -- file_x` &&
+ rm file_z &&
+ H0=`git rev-parse HEAD` &&
+ printf "## branch: $H0 master\n" >expected &&
+ printf ".M N 100644 100644 100644 000000 $SHA_X $SHA_X $SHA_ZERO R0
file_x\n" >>expected &&
+ printf ".D N 100644 100644 000000 000000 $SHA_Z $SHA_Z $SHA_ZERO R0
file_z\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ test_cmp expected actual
+'
+
+
+test_expect_success initial_commit_2 '
+ git add file_x &&
+ git rm file_z &&
+ H0=`git rev-parse HEAD` &&
+ printf "## branch: $H0 master\n" >expected &&
+ printf "M. N 100644 100644 100644 000000 $SHA_X $SHA_X1 $SHA_ZERO R0
file_x\n" >>expected &&
+ printf "D. N 100644 000000 000000 000000 $SHA_Z $SHA_ZERO $SHA_ZERO R0
file_z\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ test_cmp expected actual
+'
+
+
+test_expect_success initial_commit_3 '
+ git mv file_y renamed_y &&
+ H0=`git rev-parse HEAD` &&
+ printf "## branch: $H0 master\n" >expected &&
+ printf "M. N 100644 100644 100644 000000 $SHA_X $SHA_X1 $SHA_ZERO R0
file_x\n" >>expected &&
+ printf "D. N 100644 000000 000000 000000 $SHA_Z $SHA_ZERO $SHA_ZERO R0
file_z\n" >>expected &&
+ printf "R. N 100644 100644 100644 000000 $SHA_Y $SHA_Y $SHA_ZERO R100
renamed_y\tfile_y\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ test_cmp expected actual
+'
+
+
+##################################################################
+## Create second commit.
+##################################################################
+
+test_expect_success second_commit_0 '
+ git commit -m second &&
+ H1=`git rev-parse HEAD` &&
+ printf "## branch: $H1 master\n" >expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ test_cmp expected actual
+'
+
+
+##################################################################
+## Ignore a file
+##################################################################
+
+test_expect_success ignore_file_0 '
+ echo x.ign >.gitignore &&
+ echo "ignore me" >x.ign &&
+ H1=`git rev-parse HEAD` &&
+ printf "## branch: $H1 master\n" >expected &&
+ printf "?? .gitignore\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+ printf "!! x.ign\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ rm x.ign &&
+ rm .gitignore &&
+ test_cmp expected actual
+'
+
+
+##################################################################
+## Create some conflicts.
+##################################################################
+
+test_expect_success conflict_AA '
+ git branch AA_A master &&
+ git checkout AA_A &&
+ echo "Branch AA_A" >conflict.txt &&
+ SHA_AA_A=`git hash-object -t blob -- conflict.txt` &&
+ git add conflict.txt &&
+ git commit -m "branch aa_a" &&
+
+ git branch AA_B master &&
+ git checkout AA_B &&
+ echo "Branch AA_B" >conflict.txt &&
+ SHA_AA_B=`git hash-object -t blob -- conflict.txt` &&
+ git add conflict.txt &&
+ git commit -m "branch aa_b" &&
+
+ git branch AA_M AA_B &&
+ git checkout AA_M &&
+ test_must_fail git merge AA_A &&
+
+ HM=`git rev-parse HEAD` &&
+ printf "## branch: $HM AA_M\n" >expected &&
+ printf "AA N 000000 100644 100644 100644 $SHA_ZERO $SHA_AA_B $SHA_AA_A
R0 conflict.txt\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ git reset --hard &&
+ test_cmp expected actual
+'
+
+
+test_expect_success conflict_UU '
+ git branch UU_ANC master &&
+ git checkout UU_ANC &&
+ echo "Ancestor" >conflict.txt &&
+ SHA_UU_ANC=`git hash-object -t blob -- conflict.txt` &&
+ git add conflict.txt &&
+ git commit -m "UU_ANC" &&
+
+ git branch UU_A UU_ANC &&
+ git checkout UU_A &&
+ echo "Branch UU_A" >conflict.txt &&
+ SHA_UU_A=`git hash-object -t blob -- conflict.txt` &&
+ git add conflict.txt &&
+ git commit -m "branch uu_a" &&
+
+ git branch UU_B UU_ANC &&
+ git checkout UU_B &&
+ echo "Branch UU_B" >conflict.txt &&
+ SHA_UU_B=`git hash-object -t blob -- conflict.txt` &&
+ git add conflict.txt &&
+ git commit -m "branch uu_b" &&
+
+ git branch UU_M UU_B &&
+ git checkout UU_M &&
+ test_must_fail git merge UU_A &&
+
+ HM=`git rev-parse HEAD` &&
+ printf "## branch: $HM UU_M\n" >expected &&
+ printf "UU N 100644 100644 100644 100644 $SHA_UU_ANC $SHA_UU_B
$SHA_UU_A R0 conflict.txt\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored --untracked-files=all
>actual &&
+ git reset --hard &&
+ test_cmp expected actual
+'
+
+
+##################################################################
+## Test upstream fields in branch header
+##################################################################
+
+test_expect_success 'upstream_fields_0' '
+ git checkout master &&
+ git clone . sub_repo &&
+ (
+ ## Confirm local master tracks remote master.
+ cd sub_repo &&
+ HUF=`git rev-parse HEAD` &&
+ printf "## branch: $HUF master origin/master +0 -0\n" >expected
&&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual &&
+
+ ## Test ahead/behind.
+ echo xyz >file_xyz &&
+ git add file_xyz &&
+ git commit -m xyz &&
+
+ HUF=`git rev-parse HEAD` &&
+ printf "## branch: $HUF master origin/master +1 -0\n" >expected
&&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual &&
+
+ ## Test upstream-gone case. Fake this by pointing origin/master
at
+ ## a non-existing commit.
+ OLD=`git rev-parse origin/master` &&
+ NEW=$SHA_ZERO &&
+ mv .git/packed-refs .git/old-packed-refs &&
+ sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
+
+ HUF=`git rev-parse HEAD` &&
+ printf "## branch: $HUF master origin/master\n" >expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ ) &&
+ rm -rf sub_repo
+'
+
+
+##################################################################
+## Test submodule status flags.
+##################################################################
+
+test_expect_success 'submodule_flags_0' '
+ git checkout master &&
+ git clone . sub_repo &&
+ git clone . super_repo &&
+ ( cd super_repo &&
+ git submodule add ../sub_repo sub1 &&
+
+ ## Confirm stage/add of clean submodule.
+ HMOD=`git hash-object -t blob -- .gitmodules` &&
+ HSUP=`git rev-parse HEAD` &&
+ HSUB=$HSUP &&
+ printf "## branch: $HSUP master origin/master +0 -0\n"
>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $HMOD
$SHA_ZERO R0 .gitmodules\n" >>expected &&
+ printf "A. S 000000 160000 160000 000000 $SHA_ZERO $HSUB
$SHA_ZERO R0 sub1\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'submodule_flags_1' '
+ ( cd super_repo &&
+ ## Make some untracked dirt in the submodule.
+ ( cd sub1 &&
+ echo "dirt" >file_in_sub
+ ) &&
+
+ HMOD=`git hash-object -t blob -- .gitmodules` &&
+ HSUP=`git rev-parse HEAD` &&
+ HSUB=$HSUP &&
+ printf "## branch: $HSUP master origin/master +0 -0\n"
>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $HMOD
$SHA_ZERO R0 .gitmodules\n" >>expected &&
+ printf "AM SU 000000 160000 160000 000000 $SHA_ZERO $HSUB
$SHA_ZERO R0 sub1\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'submodule_flags_2' '
+ ( cd super_repo &&
+ ## Make some staged dirt in the submodule.
+ ( cd sub1 &&
+ git add file_in_sub
+ ) &&
+
+ HMOD=`git hash-object -t blob -- .gitmodules` &&
+ HSUP=`git rev-parse HEAD` &&
+ HSUB=$HSUP &&
+ printf "## branch: $HSUP master origin/master +0 -0\n"
>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $HMOD
$SHA_ZERO R0 .gitmodules\n" >>expected &&
+ printf "AM SM 000000 160000 160000 000000 $SHA_ZERO $HSUB
$SHA_ZERO R0 sub1\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'submodule_flags_3' '
+ ( cd super_repo &&
+ ## Make some staged and unstaged dirt (on the same file) in the
submodule.
+ ## This does not cause us to get SMU (because the submodule
does not report
+ ## a "??" line for the unstaged changes).
+ ( cd sub1 &&
+ echo "more dirt" >>file_in_sub
+ ) &&
+
+ HMOD=`git hash-object -t blob -- .gitmodules` &&
+ HSUP=`git rev-parse HEAD` &&
+ HSUB=$HSUP &&
+ printf "## branch: $HSUP master origin/master +0 -0\n"
>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $HMOD
$SHA_ZERO R0 .gitmodules\n" >>expected &&
+ printf "AM SM 000000 160000 160000 000000 $SHA_ZERO $HSUB
$SHA_ZERO R0 sub1\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'submodule_flags_4' '
+ ( cd super_repo &&
+ ## Make some staged and untracked dirt (on different files) in
the submodule.
+ ( cd sub1 &&
+ git add file_in_sub &&
+ echo "dirt" >>another_file_in_sub
+ ) &&
+
+ HMOD=`git hash-object -t blob -- .gitmodules` &&
+ HSUP=`git rev-parse HEAD` &&
+ HSUB=$HSUP &&
+ printf "## branch: $HSUP master origin/master +0 -0\n"
>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $HMOD
$SHA_ZERO R0 .gitmodules\n" >>expected &&
+ printf "AM SMU 000000 160000 160000 000000 $SHA_ZERO $HSUB
$SHA_ZERO R0 sub1\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'submodule_flags_5' '
+ ( cd super_repo &&
+ ## Make a new commit in the submodule.
+ ( cd sub1 &&
+ git add file_in_sub &&
+ rm -f another_file_in_sub &&
+ git commit -m "new commit"
+ ) &&
+
+ HMOD=`git hash-object -t blob -- .gitmodules` &&
+ HSUP=`git rev-parse HEAD` &&
+ HSUB=$HSUP &&
+ printf "## branch: $HSUP master origin/master +0 -0\n"
>expected &&
+ printf "A. N 000000 100644 100644 000000 $SHA_ZERO $HMOD
$SHA_ZERO R0 .gitmodules\n" >>expected &&
+ printf "AM SC 000000 160000 160000 000000 $SHA_ZERO $HSUB
$SHA_ZERO R0 sub1\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'submodule_flags_6' '
+ ( cd super_repo &&
+ ## Commit the new submodule commit in the super.
+ git add sub1 &&
+ git commit -m "super commit" &&
+
+ HSUP=`git rev-parse HEAD` &&
+ printf "## branch: $HSUP master origin/master +1 -0\n"
>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'submodule_flags_7' '
+ ( cd super_repo &&
+ ## Make some untracked dirt in the submodule.
+ ( cd sub1 &&
+ echo "yet more dirt" >>file_in_sub
+ ) &&
+
+ HMOD=`git hash-object -t blob -- .gitmodules` &&
+ HSUP=`git rev-parse HEAD` &&
+ HSUB=`(cd sub1 && git rev-parse HEAD)` &&
+ printf "## branch: $HSUP master origin/master +1 -0\n"
>expected &&
+ printf ".M SM 160000 160000 160000 000000 $HSUB $HSUB $SHA_ZERO
R0 sub1\n" >>expected &&
+ printf "?? actual\n" >>expected &&
+ printf "?? expected\n" >>expected &&
+
+ git status --porcelain=2 --branch --ignored
--untracked-files=all >actual &&
+ test_cmp expected actual
+ )
+'
+
+##################################################################
+## The end.
+##################################################################
+
+test_done
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 1a74d75..753bae5 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -77,6 +77,10 @@ test_expect_success '--porcelain=1 fails with nothing to
commit' '
test_must_fail git commit -m initial --porcelain=1
'
+test_expect_success '--porcelain=2 fails with nothing to commit' '
+ test_must_fail git commit -m initial --porcelain=2
+'
+
test_expect_success '--long fails with nothing to commit' '
test_must_fail git commit -m initial --long
'
@@ -106,6 +110,11 @@ test_expect_failure '--porcelain=1 with stuff to commit
returns ok' '
git commit -m next -a --porcelain=1
'
+test_expect_failure '--porcelain=2 with stuff to commit returns ok' '
+ echo bongo bongo bongo >>file &&
+ git commit -m next -a --porcelain=2
+'
+
test_expect_failure '--porcelain=bogus with stuff to commit returns ok' '
echo bongo bongo bongo >>file &&
git commit -m next -a --porcelain=bogus
--
2.8.0.rc4.17.gac42084.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
