t7601: use "test_path_is_file" etc. instead of "test -f"
Some tests in t7601 use "test -f" and "test ! -f" to see if a path exists or is missing. Use test_path_is_file and test_path_is_missing helper functions to clarify these tests a bit better. This especially matters for the "missing" case because "test ! -f F" will be happy if "F" exists as a directory, but the intent of the test is that "F" should not exist, even as a directory. The updated code expresses this better. Signed-off-by: Dorcas AnonoLitunya <anonolitunya@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dorcas AnonoLitunya committed
Oct 18, 2023 at 15:45 UTC
5abb758118ebbc85fce114176722670c858f4b62
1 file changed
+12
-12
t/t7601-merge-pull-config.sh
+12
-12
@@ -349,13 +349,13 @@ test_expect_success 'Cannot rebase with multiple heads' '
349
350
test_expect_success 'merge c1 with c2' '
351
git reset --hard c1 &&
352
- test -f c0.c &&
353
- test -f c1.c &&
354
- test ! -f c2.c &&
355
- test ! -f c3.c &&
352
+ test_path_is_file c0.c &&
353
+ test_path_is_file c1.c &&
354
+ test_path_is_missing c2.c &&
355
+ test_path_is_missing c3.c &&
356
git merge c2 &&
357
- test -f c1.c &&
358
- test -f c2.c
357
+ test_path_is_file c1.c &&
358
+ test_path_is_file c2.c
359
'
360
361
test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' '
@@ -411,8 +411,8 @@ test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
411
git reset --hard c1 &&
412
git config pull.twohead ours &&
413
git merge c2 &&
414
- test -f c1.c &&
415
- ! test -f c2.c
414
+ test_path_is_file c1.c &&
415
+ test_path_is_missing c2.c
416
'
417
418
test_expect_success 'merge c1 with c2 and c3 (recursive in pull.octopus)' '
@@ -431,10 +431,10 @@ test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octo
431
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
432
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
433
git diff --exit-code &&
434
- test -f c0.c &&
435
- test -f c1.c &&
436
- test -f c2.c &&
437
- test -f c3.c
434
+ test_path_is_file c0.c &&
435
+ test_path_is_file c1.c &&
436
+ test_path_is_file c2.c &&
437
+ test_path_is_file c3.c
438
'
439
440
conflict_count()