Description
Jonathan Druart
2025-09-23 07:47:43 UTC
Created attachment 186777 [details] [review] Bug 40858: Rename context 'all' with 'core' All was not returning all the files present in the git index, but all Koha core files. Let's rename it with 'core' to remove ambiguity. Created attachment 186778 [details] [review] Bug 40858: Search merge conflict on files part of the git index Same as bug 34303 and bug 33743, our test suite must parse/process files that are part of the index, not all the other files. It's currently failing on kohadev-db-request.txt that is owned by root. But it's not part of the Koha codebase, this file should not be tested. There were also node_modules and po files that were processed. Test plan: prove t/00-merge-conflict-markers.t must now return gren Created attachment 186790 [details] [review] Bug 40858: Search merge conflict on files part of the git index Same as bug 34303 and bug 33743, our test suite must parse/process files that are part of the index, not all the other files. It's currently failing on kohadev-db-request.txt that is owned by root. But it's not part of the Koha codebase, this file should not be tested. There were also node_modules and po files that were processed. Test plan: prove t/00-merge-conflict-markers.t must now return gren Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Created attachment 186791 [details] [review] Bug 40858: Rename context 'all' with 'core' All was not returning all the files present in the git index, but all Koha core files. Let's rename it with 'core' to remove ambiguity. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Created attachment 186792 [details] [review] Bug 40858: Search merge conflict on files part of the git index Same as bug 34303 and bug 33743, our test suite must parse/process files that are part of the index, not all the other files. It's currently failing on kohadev-db-request.txt that is owned by root. But it's not part of the Koha codebase, this file should not be tested. There were also node_modules and po files that were processed. Test plan: prove t/00-merge-conflict-markers.t must now return gren Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Created attachment 186876 [details] [review] Bug 40858: Rename context 'all' with 'core' All was not returning all the files present in the git index, but all Koha core files. Let's rename it with 'core' to remove ambiguity. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Created attachment 186877 [details] [review] Bug 40858: Search merge conflict on files part of the git index Same as bug 34303 and bug 33743, our test suite must parse/process files that are part of the index, not all the other files. It's currently failing on kohadev-db-request.txt that is owned by root. But it's not part of the Koha codebase, this file should not be tested. There were also node_modules and po files that were processed. Test plan: prove t/00-merge-conflict-markers.t must now return gren Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Nice work everyone! Pushed to main for 25.11 Nice work everyone! Pushed to 25.05.x |