From 9be52dcd62e77b6ae8c74720f315ff0b5fbf3fa8 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Mon, 12 Aug 2024 15:57:34 +0200 Subject: [PATCH] Fix git check in verify generated files (GH-15363) Git 2.46.0 accidentally broke git diff --exit-code for files flagged with -diff. Add the -a flag to restore the previous behavior. This issue is already fixed in gits next branch. --- .github/actions/verify-generated-files/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/verify-generated-files/action.yml b/.github/actions/verify-generated-files/action.yml index 139dd84662411..266f4d33c93b1 100644 --- a/.github/actions/verify-generated-files/action.yml +++ b/.github/actions/verify-generated-files/action.yml @@ -12,4 +12,5 @@ runs: ext/tokenizer/tokenizer_data_gen.php build/gen_stub.php -f build/gen_stub.php --generate-optimizer-info - git add . -N && git diff --exit-code + # Use the -a flag for a bug in git 2.46.0, which doesn't consider changed -diff files. + git add . -N && git diff -a --exit-code