global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-12 01:49:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ms/t7605-test-path-is-helpers' into seen

Browse Source 
* ms/t7605-test-path-is-helpers:
  t7605: use test_path_is_file instead of test -f
This commit is contained in:
Junio C Hamano
2026-03-10 16:26:28 -07:00
parent be64400f67 69efd53c81
commit b91fb8775f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t7605-merge-resolve.sh
View File

@@ -34,9 +34,9 @@ merge_c1_to_c2_cmds='
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
test -f c2.c &&
test_path_is_file c0.c &&
test_path_is_file c1.c &&
test_path_is_file c2.c &&
test 3 = $(git ls-tree -r HEAD | wc -l) &&
test 3 = $(git ls-files | wc -l)
'