mirror of
https://github.com/git/git.git
synced 2026-01-27 19:12:01 +00:00
status: unit tests for --porcelain=v2
Test porcelain v2 status format. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler
committed by
Johannes Schindelin
Johannes Schindelin
parent
0915645334
commit
af336aeceb
597
t/t7064-wtstatus-pv2.sh
Executable file
597
t/t7064-wtstatus-pv2.sh
Executable file
@@ -0,0 +1,597 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='git status --porcelain=v2
|
||||
|
||||
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 output prior to initial commit.
|
||||
##################################################################
|
||||
|
||||
test_expect_success pre_initial_commit_0 '
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid (initial)
|
||||
# branch.head master
|
||||
? actual
|
||||
? dir1/
|
||||
? expect
|
||||
? file_x
|
||||
? file_y
|
||||
? file_z
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=normal >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
test_expect_success pre_initial_commit_1 '
|
||||
git add file_x file_y file_z dir1 &&
|
||||
OID_A=$(git hash-object -t blob -- dir1/file_a) &&
|
||||
OID_B=$(git hash-object -t blob -- dir1/file_b) &&
|
||||
OID_X=$(git hash-object -t blob -- file_x) &&
|
||||
OID_Y=$(git hash-object -t blob -- file_y) &&
|
||||
OID_Z=$(git hash-object -t blob -- file_z) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid (initial)
|
||||
# branch.head master
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_A dir1/file_a
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_B dir1/file_b
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_X file_x
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_Y file_y
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_Z file_z
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
## Try -z on the above
|
||||
test_expect_success pre_initial_commit_2 '
|
||||
lf_to_nul >expect <<-EOF &&
|
||||
# branch.oid (initial)
|
||||
# branch.head master
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_A dir1/file_a
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_B dir1/file_b
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_X file_x
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_Y file_y
|
||||
1 A. N... 000000 100644 100644 $_z40 $OID_Z file_z
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status -z --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
##################################################################
|
||||
## Create first commit. Confirm commit oid 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) &&
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $H0
|
||||
# branch.head master
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
test_expect_success initial_commit_1 '
|
||||
echo x >>file_x &&
|
||||
OID_X1=$(git hash-object -t blob -- file_x) &&
|
||||
rm file_z &&
|
||||
H0=$(git rev-parse HEAD) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $H0
|
||||
# branch.head master
|
||||
1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
|
||||
1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
test_expect_success initial_commit_2 '
|
||||
git add file_x &&
|
||||
git rm file_z &&
|
||||
H0=$(git rev-parse HEAD) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $H0
|
||||
# branch.head master
|
||||
1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
|
||||
1 D. N... 100644 000000 000000 $OID_Z $_z40 file_z
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
test_expect_success initial_commit_3 '
|
||||
git mv file_y renamed_y &&
|
||||
H0=$(git rev-parse HEAD) &&
|
||||
|
||||
q_to_tab >expect <<-EOF &&
|
||||
# branch.oid $H0
|
||||
# branch.head master
|
||||
1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
|
||||
1 D. N... 100644 000000 000000 $OID_Z $_z40 file_z
|
||||
2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
##################################################################
|
||||
## Create second commit.
|
||||
##################################################################
|
||||
|
||||
test_expect_success second_commit_0 '
|
||||
git commit -m second &&
|
||||
H1=$(git rev-parse HEAD) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $H1
|
||||
# branch.head master
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
##################################################################
|
||||
## Ignore a file
|
||||
##################################################################
|
||||
|
||||
test_expect_success ignore_file_0 '
|
||||
echo x.ign >.gitignore &&
|
||||
echo "ignore me" >x.ign &&
|
||||
H1=$(git rev-parse HEAD) &&
|
||||
|
||||
## ignored file SHOULD NOT appear in output when --ignored is not used.
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $H1
|
||||
# branch.head master
|
||||
? .gitignore
|
||||
? actual
|
||||
? expect
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
## ignored file SHOULD appear in output when --ignored is used.
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $H1
|
||||
# branch.head master
|
||||
? .gitignore
|
||||
? actual
|
||||
? expect
|
||||
! x.ign
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&
|
||||
rm x.ign &&
|
||||
rm .gitignore &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
##################################################################
|
||||
## Create a permanent .gitignore file so we can stop worrying
|
||||
## about test trash in subsequent tests.
|
||||
##################################################################
|
||||
|
||||
test_expect_success ignore_trash '
|
||||
cat >.gitignore <<-EOF &&
|
||||
actual*
|
||||
expect*
|
||||
EOF
|
||||
|
||||
git add .gitignore &&
|
||||
git commit -m ignore_trash &&
|
||||
H1=$(git rev-parse HEAD) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $H1
|
||||
# branch.head master
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
##################################################################
|
||||
## Create some conflicts.
|
||||
##################################################################
|
||||
|
||||
test_expect_success conflict_AA '
|
||||
git branch AA_A master &&
|
||||
git checkout AA_A &&
|
||||
echo "Branch AA_A" >conflict.txt &&
|
||||
OID_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 &&
|
||||
OID_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) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HM
|
||||
# branch.head AA_M
|
||||
u AA N... 000000 100644 100644 100644 $_z40 $OID_AA_B $OID_AA_A conflict.txt
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
git reset --hard &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
test_expect_success conflict_UU '
|
||||
git branch UU_ANC master &&
|
||||
git checkout UU_ANC &&
|
||||
echo "Ancestor" >conflict.txt &&
|
||||
OID_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 &&
|
||||
OID_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 &&
|
||||
OID_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) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HM
|
||||
# branch.head UU_M
|
||||
u UU N... 100644 100644 100644 100644 $OID_UU_ANC $OID_UU_B $OID_UU_A conflict.txt
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
git reset --hard &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
||||
##################################################################
|
||||
## Test upstream fields in branch header
|
||||
##################################################################
|
||||
|
||||
test_expect_success 'upstream_fields_0' '
|
||||
git checkout master &&
|
||||
test_when_finished rm -rf sub_repo &&
|
||||
git clone . sub_repo &&
|
||||
(
|
||||
## Confirm local master tracks remote master.
|
||||
cd sub_repo &&
|
||||
HUF=$(git rev-parse HEAD) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HUF
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +0 -0
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
## Test ahead/behind.
|
||||
echo xyz >file_xyz &&
|
||||
git add file_xyz &&
|
||||
git commit -m xyz &&
|
||||
|
||||
HUF=$(git rev-parse HEAD) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HUF
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +1 -0
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
## Repeat the above but without --branch.
|
||||
cat >expect <<-EOF &&
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --untracked-files=all >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
## Test upstream-gone case. Fake this by pointing origin/master at
|
||||
## a non-existing commit.
|
||||
OLD=$(git rev-parse origin/master) &&
|
||||
NEW=$_z40 &&
|
||||
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) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HUF
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
'
|
||||
|
||||
|
||||
##################################################################
|
||||
## 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 &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +0 -0
|
||||
1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules
|
||||
1 A. S... 000000 160000 160000 $_z40 $HSUB sub1
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect 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 &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +0 -0
|
||||
1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules
|
||||
1 AM S..U 000000 160000 160000 $_z40 $HSUB sub1
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect 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 &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +0 -0
|
||||
1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules
|
||||
1 AM S.M. 000000 160000 160000 $_z40 $HSUB sub1
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect 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 S.MU (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 &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +0 -0
|
||||
1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules
|
||||
1 AM S.M. 000000 160000 160000 $_z40 $HSUB sub1
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect 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 &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +0 -0
|
||||
1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules
|
||||
1 AM S.MU 000000 160000 160000 $_z40 $HSUB sub1
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect 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 &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +0 -0
|
||||
1 A. N... 000000 100644 100644 $_z40 $HMOD .gitmodules
|
||||
1 AM SC.. 000000 160000 160000 $_z40 $HSUB sub1
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect 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) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +1 -0
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect 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) &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
# branch.oid $HSUP
|
||||
# branch.head master
|
||||
# branch.upstream origin/master
|
||||
# branch.ab +1 -0
|
||||
1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
|
||||
EOF
|
||||
|
||||
git status --porcelain=v2 --branch --untracked-files=all >actual &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
'
|
||||
|
||||
##################################################################
|
||||
## The end.
|
||||
##################################################################
|
||||
|
||||
test_done
|
||||
Reference in New Issue
Block a user