@@ -16,8 +16,8 @@ echo '1
7
8' >file
-test_expect_success 'setup' \
- 'git add file &&
+test_expect_success 'setup' '
+ git add file &&
git commit -q -m 1 &&
git checkout -b test &&
mv file file.tmp &&
@@ -27,10 +27,11 @@ test_expect_success 'setup' \
git commit -a -q -m 2 &&
echo 9 >>file &&
git commit -a -q -m 3 &&
- git checkout main'
+ git checkout main
+'
-test_expect_success \
- 'check if contextually independent diffs for the same file apply' \
- '( git diff test~2 test~1 && git diff test~1 test~0 )| git apply'
+test_expect_success 'check if contextually independent diffs for the same file apply' '
+ ( git diff test~2 test~1 && git diff test~1 test~0 ) | git apply
+'
test_done
Test scripts in file t4121-apply-diffs.sh are written in old style, where the test_expect_success command and test title are written on separate lines, therefore update the tests to adhere to the new style. Signed-off-by: Vivan Garg <gvivan6@gmail.com> --- t/t4121-apply-diffs.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)