Merge branch 'tk/t5402-test-path-helper' into jch
Use of "test -e" and "! test -e" in t5402 have been updated to use test_path_exists and test_path_missing. * tk/t5402-test-path-helper: t5402: use test_path_* helpers instead of test -e and test -f
This commit is contained in:
commit
f0a480ea07
1 file changed
+3
-3
@@ -37,12 +37,12 @@ test_expect_success 'setup clone hooks' '
|
||||
|
||||
test_expect_success 'post-merge does not run for up-to-date ' '
|
||||
GIT_DIR=clone1/.git git merge $commit0 &&
|
||||
! test -f clone1/.git/post-merge.args
|
||||
test_path_is_missing clone1/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-merge runs as expected ' '
|
||||
GIT_DIR=clone1/.git git merge $commit1 &&
|
||||
test -e clone1/.git/post-merge.args
|
||||
test_path_exists clone1/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-merge from normal merge receives the right argument ' '
|
||||
@@ -51,7 +51,7 @@ test_expect_success 'post-merge from normal merge receives the right argument '
|
||||
|
||||
test_expect_success 'post-merge from squash merge runs as expected ' '
|
||||
GIT_DIR=clone2/.git git merge --squash $commit1 &&
|
||||
test -e clone2/.git/post-merge.args
|
||||
test_path_exists clone2/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-merge from squash merge receives the right argument ' '
|
||||
|
||||
Reference in new issue
Block a user