Merge commit 'refs/pull/71710/head' of github.com:microsoft/vscode into pr/71710

joaomoreno · joaomoreno · commit 5481dcca5e44 · 2019-08-08T12:17:46.000+02:00
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -1754,7 +1754,7 @@ export class Repository {
 			}
 
 			const raw = await readfile(templatePath, 'utf8');
-			return raw.replace(/^\s*#.*$\n?/gm, '').trim();
+			return raw.replace(/\n?#.*/g, '');
 
 		} catch (err) {
 			return '';

Original file line number	Diff line number	Diff line change
`@@ -1754,7 +1754,7 @@ export class Repository {`
`1754`	`1754`	`}`
`1755`	`1755`
`1756`	`1756`	`const raw = await readfile(templatePath, 'utf8');`
`1757`		`- return raw.replace(/^\s#.$\n?/gm, '').trim();`
	`1757`	`+ return raw.replace(/\n?#.*/g, '');`
`1758`	`1758`
`1759`	`1759`	`} catch (err) {`
`1760`	`1760`	`return '';`