From 830429ee03d636dadcbcfe604d241b6553e039b3 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sun, 6 Jan 2019 09:36:04 -0600 Subject: [PATCH] Fixed .gitingore "changed" files with github-remove script (#9616) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply `, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. --- scripts/github-remove | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/github-remove b/scripts/github-remove index 98e597bbe1..af91051d13 100755 --- a/scripts/github-remove +++ b/scripts/github-remove @@ -37,6 +37,8 @@ if args.discard: call(["git", "reset", "-q"], cwd=librenms_dir) call(["git", "checkout", "."], cwd=librenms_dir) call(["git", "clean", "-d", "-f"] + dirs, cwd=librenms_dir) + # fix messed up gitignore file modes + call(["git", "checkout", "bootstrap/cache/.gitignore", "storage/app/.gitignore", "storage/app/public/.gitignore", "storage/debugbar/.gitignore", "storage/framework/cache/.gitignore", "storage/framework/sessions/.gitignore", "storage/framework/testing/.gitignore", "storage/framework/views/.gitignore", "storage/logs/.gitignore"]) if args.vendor: call(["git", "clean", "-x", "-d", "-f", "vendor/"], cwd=librenms_dir)