File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ test_expect_success 'reset should remove remnants from a failed merge' '
4040 git ls-files -s &&
4141 read_tree_u_must_succeed --reset -u HEAD &&
4242 git ls-files -s >actual &&
43- ! test -f old &&
43+ test_path_is_missing old &&
4444 test_cmp expect actual
4545'
4646
@@ -56,7 +56,7 @@ test_expect_success 'two-way reset should remove remnants too' '
5656 git ls-files -s &&
5757 read_tree_u_must_succeed --reset -u HEAD HEAD &&
5858 git ls-files -s >actual &&
59- ! test -f old &&
59+ test_path_is_missing old &&
6060 test_cmp expect actual
6161'
6262
@@ -72,7 +72,7 @@ test_expect_success 'Porcelain reset should remove remnants too' '
7272 git ls-files -s &&
7373 git reset --hard &&
7474 git ls-files -s >actual &&
75- ! test -f old &&
75+ test_path_is_missing old &&
7676 test_cmp expect actual
7777'
7878
@@ -88,7 +88,7 @@ test_expect_success 'Porcelain checkout -f should remove remnants too' '
8888 git ls-files -s &&
8989 git checkout -f &&
9090 git ls-files -s >actual &&
91- ! test -f old &&
91+ test_path_is_missing old &&
9292 test_cmp expect actual
9393'
9494
@@ -104,7 +104,7 @@ test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
104104 git ls-files -s &&
105105 git checkout -f HEAD &&
106106 git ls-files -s >actual &&
107- ! test -f old &&
107+ test_path_is_missing old &&
108108 test_cmp expect actual
109109'
110110
You can’t perform that action at this time.
0 commit comments