Skip to content

Commit 8fc184c

Browse files
rybakgitster
authored andcommitted
t1005: assert output of ls-files
Test 'reset should work' in t1005-read-tree-reset.sh compares two files "expect" and "actual" to assert the expected output of "git ls-files". Several other tests in the same file also create files "expect" and "actual", but don't use them in assertions. Assert output of "git ls-files" in t1005-read-tree-reset.sh to improve test coverage. Signed-off-by: Andrei Rybak <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 73876f4 commit 8fc184c

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

t/t1005-read-tree-reset.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ test_expect_success 'reset should remove remnants from a failed merge' '
4141
git ls-files -s &&
4242
read_tree_u_must_succeed --reset -u HEAD &&
4343
git ls-files -s >actual &&
44-
! test -f old
44+
! test -f old &&
45+
test_cmp expect actual
4546
'
4647

4748
test_expect_success 'two-way reset should remove remnants too' '
@@ -56,7 +57,8 @@ test_expect_success 'two-way reset should remove remnants too' '
5657
git ls-files -s &&
5758
read_tree_u_must_succeed --reset -u HEAD HEAD &&
5859
git ls-files -s >actual &&
59-
! test -f old
60+
! test -f old &&
61+
test_cmp expect actual
6062
'
6163

6264
test_expect_success 'Porcelain reset should remove remnants too' '
@@ -71,7 +73,8 @@ test_expect_success 'Porcelain reset should remove remnants too' '
7173
git ls-files -s &&
7274
git reset --hard &&
7375
git ls-files -s >actual &&
74-
! test -f old
76+
! test -f old &&
77+
test_cmp expect actual
7578
'
7679

7780
test_expect_success 'Porcelain checkout -f should remove remnants too' '
@@ -86,7 +89,8 @@ test_expect_success 'Porcelain checkout -f should remove remnants too' '
8689
git ls-files -s &&
8790
git checkout -f &&
8891
git ls-files -s >actual &&
89-
! test -f old
92+
! test -f old &&
93+
test_cmp expect actual
9094
'
9195

9296
test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
@@ -101,7 +105,8 @@ test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
101105
git ls-files -s &&
102106
git checkout -f HEAD &&
103107
git ls-files -s >actual &&
104-
! test -f old
108+
! test -f old &&
109+
test_cmp expect actual
105110
'
106111

107112
test_done

0 commit comments

Comments
 (0)