Skip to content

Commit e41b56e

Browse files
authored
Merge pull request #260 from greg0ire/fix-update-compat-patch-74
Pass correct patch filename to git apply
2 parents f4079ae + 6b830e7 commit e41b56e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ test-fix: vendor
1818
@if [ -f "$(PATCH_FILE)" ]; then git apply -R $(PATCH_FILE) ; fi
1919

2020
update-compatibility-patch-74:
21-
@git apply tests/php-compatibility.patch
21+
@git apply tests/php74-compatibility.patch
2222
@printf "Please open your editor and apply your changes\n"
2323
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
24-
@git diff -- tests/expected_report.txt tests/fixed > .tmp-patch && mv .tmp-patch tests/php-compatibility.patch && git apply -R tests/php-compatibility.patch
25-
@git commit -m 'Update compatibility patch' tests/php-compatibility.patch
24+
@git diff -- tests/expected_report.txt tests/fixed > .tmp-patch && mv .tmp-patch tests/php74-compatibility.patch && git apply -R tests/php74-compatibility.patch
25+
@git commit -m 'Update compatibility patch' tests/php74-compatibility.patch
2626

2727
update-compatibility-patch-80:
2828
@git apply tests/php80-compatibility.patch

0 commit comments

Comments
 (0)