Merge branch 'master' into prefix-string-option

nlm-pro · nlm-pro · commit 77854faa6766 · 2016-12-07T23:34:05.000+01:00
diff --git a/packages/angular-cli/commands/github-pages-deploy.ts b/packages/angular-cli/commands/github-pages-deploy.ts
@@ -217,7 +217,10 @@ const githubPagesDeployCommand = Command.extend({
               files = files.concat(`"${f}" `);
             }
           });
-          return execPromise(`git rm -r ${files}`);
+          return execPromise(`git rm -r ${files}`)
+            .catch(() => {
+              // Ignoring errors when trying to erase files.
+            });
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,10 @@ const githubPagesDeployCommand = Command.extend({`
`217`	`217`	files = files.concat(`"${f}" `);
`218`	`218`	`}`
`219`	`219`	`});`
`220`		- return execPromise(`git rm -r ${files}`);
	`220`	+ return execPromise(`git rm -r ${files}`)
	`221`	`+ .catch(() => {`
	`222`	`+ // Ignoring errors when trying to erase files.`
	`223`	`+ });`
`221`	`224`	`});`
`222`	`225`	`}`
`223`	`226`