Unverified Commit 2296602c authored by Alex Pott's avatar Alex Pott
Browse files

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

composer/Plugin/Scaffold/ManageGitIgnore.php

+2 −3
Original line number Diff line number Diff line
@@ -91,9 +91,8 @@ protected function managementOfGitIgnoreEnabled(ScaffoldOptions $options) { 
    }



    // If the composer.json did not specify whether or not .gitignore files

    // should be managed, then manage them if the vendor directory is not

    // committed.

    return !Git::checkTracked($this->io, 'vendor', $this->dir);

    // should be managed, then manage them if the vendor directory is ignored.

    return Git::checkIgnore($this->io, 'vendor', $this->dir);

  }



  /**

composer/Plugin/Scaffold/README.md

+1 −1
Original line number Diff line number Diff line
@@ -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.

- false: `.gitignore` files will never be modified.

- 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.



### locations