Commit 2296602c authored by alexpott's avatar alexpott

Issue #3085354 by greg.1.anderson, mbaynton, hussainweb: Better default...

Issue #3085354 by greg.1.anderson, mbaynton, hussainweb: Better default behavior for scaffold-created .gitignore files
parent 66258696
...@@ -91,9 +91,8 @@ protected function managementOfGitIgnoreEnabled(ScaffoldOptions $options) { ...@@ -91,9 +91,8 @@ protected function managementOfGitIgnoreEnabled(ScaffoldOptions $options) {
} }
// If the composer.json did not specify whether or not .gitignore files // If the composer.json did not specify whether or not .gitignore files
// should be managed, then manage them if the vendor directory is not // should be managed, then manage them if the vendor directory is ignored.
// committed. return Git::checkIgnore($this->io, 'vendor', $this->dir);
return !Git::checkTracked($this->io, 'vendor', $this->dir);
} }
/** /**
......
...@@ -302,7 +302,7 @@ manage `.gitignore` files for files written during the scaffold operation. ...@@ -302,7 +302,7 @@ manage `.gitignore` files for files written during the scaffold operation.
- true: `.gitignore` files will be updated when scaffold files are written. - true: `.gitignore` files will be updated when scaffold files are written.
- false: `.gitignore` files will never be modified. - false: `.gitignore` files will never be modified.
- Not set: `.gitignore` files will be updated if the target directory is a local - Not set: `.gitignore` files will be updated if the target directory is a local
working copy of a git repository, and the `vendor` directory is not committed working copy of a git repository, and the `vendor` directory is ignored
in that repository. in that repository.
### locations ### locations
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment