Skip to content

Commit

Permalink
fix(@angular/cli): Changed init order to make sure all files gets com…
Browse files Browse the repository at this point in the history
…mitted

With the update of npm 5 and the introduction of package-lock.json all files weren't
committed into the first commit.
  • Loading branch information
danielronnkvist authored and filipesilva committed Jun 28, 2017
1 parent d133a05 commit 0c6a9c5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/@angular/cli/tasks/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ export default Task.extend({

return installBlueprint.run(blueprintOpts)
.then(function () {
if (commandOptions.skipGit === false) {
return gitInit.run(commandOptions, rawArgs);
if (!commandOptions.skipInstall) {
return npmInstall.run();
}
})
.then(function () {
if (!commandOptions.skipInstall) {
return npmInstall.run();
if (commandOptions.skipGit === false) {
return gitInit.run(commandOptions, rawArgs);
}
})
.then(function () {
Expand Down

0 comments on commit 0c6a9c5

Please sign in to comment.