Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #84274

Browse Source
This commit is contained in:
Joao Moreno
2019-11-08 15:55:30 +01:00
parent 655bd8f303
commit fd091abb85
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/git/src/repository.ts
View File

@@ -844,7 +844,15 @@ export class Repository implements Disposable {
return mergeMessage;
}
return await this.repository.getCommitTemplate();
let template = await this.repository.getCommitTemplate();
const config = workspace.getConfiguration('git', Uri.file(this.root));
if (!config.get<boolean>('restoreCommitTemplateComments')) {
template = this.cleanUpCommitEditMessage(template);
}
return template;
}
getConfigs(): Promise<{ key: string; value: string; }[]> {
@@ -1278,7 +1286,7 @@ export class Repository implements Disposable {
return await this.run(Operation.GetCommitTemplate, async () => this.repository.getCommitTemplate());
}
async cleanUpCommitEditMessage(editMessage: string): Promise<string> {
cleanUpCommitEditMessage(editMessage: string): string {
return this.repository.cleanupCommitEditMessage(editMessage);
}