admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'da/t7601-style-fix'

Browse Source 
Coding style update.

* da/t7601-style-fix:
  t7601: use "test_path_is_file" etc. instead of "test -f"
This commit is contained in:
Junio C Hamano
2023-10-30 07:09:56 +09:00
parent 1551066dc5 5abb758118
commit 3a5e77e346
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
t/t7601-merge-pull-config.sh
View File

@@ -349,13 +349,13 @@ test_expect_success 'Cannot rebase with multiple heads' '
test_expect_success 'merge c1 with c2' '
git reset --hard c1 &&
test -f c0.c &&
test -f c1.c &&
test ! -f c2.c &&
test ! -f c3.c &&
test_path_is_file c0.c &&
test_path_is_file c1.c &&
test_path_is_missing c2.c &&
test_path_is_missing c3.c &&
git merge c2 &&
test -f c1.c &&
test -f c2.c
test_path_is_file c1.c &&
test_path_is_file c2.c
'
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)' '
git reset --hard c1 &&
git config pull.twohead ours &&
git merge c2 &&
test -f c1.c &&
! test -f c2.c
test_path_is_file c1.c &&
test_path_is_missing c2.c
'
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
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
test -f c2.c &&
test -f c3.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
'
conflict_count()