eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-12 05:43:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lo/t7603-path-is-file-update'

Browse Source 
Test clean-up.

* lo/t7603-path-is-file-update:
  t7603: replace test -f by test_path_is_file
This commit is contained in:
Junio C Hamano 2025-02-18 15:30:33 -08:00
commit 5dd710cb62
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
t/t7603-merge-reduce-heads.sh
View File

@ -52,12 +52,12 @@ test_expect_success 'merge c1 with c2, c3, c4, c5' '
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
test -f c2.c &&
test -f c3.c &&
test -f c4.c &&
test -f c5.c &&
test_path_is_file c0.c &&
test_path_is_file c1.c &&
test_path_is_file c2.c &&
test_path_is_file c3.c &&
test_path_is_file c4.c &&
test_path_is_file c5.c &&
git show --format=%s -s >actual &&
! grep c1 actual &&
grep c2 actual &&
@ -75,12 +75,12 @@ test_expect_success 'pull c2, c3, c4, c5 into c1' '
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
test -f c2.c &&
test -f c3.c &&
test -f c4.c &&
test -f c5.c &&
test_path_is_file c0.c &&
test_path_is_file c1.c &&
test_path_is_file c2.c &&
test_path_is_file c3.c &&
test_path_is_file c4.c &&
test_path_is_file c5.c &&
git show --format=%s -s >actual &&
! grep c1 actual &&
grep c2 actual &&