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

Changing auto-fill commit message to check for getMergeMessage OR getSquashMessage

Browse Source
This commit is contained in:
Daniel Davis
2020-06-26 13:26:40 +01:00
parent 3f90d90ab2
commit 05e719bede
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -865,13 +865,10 @@ export class Repository implements Disposable {
}
async getInputTemplate(): Promise<string> {
const mergeMessage = await this.repository.getMergeMessage();
const squashMessage = await this.repository.getSquashMessage();
const commitMessage = await this.repository.getMergeMessage() || await this.repository.getSquashMessage();
if (mergeMessage) {
return mergeMessage;
} else if (squashMessage) {
return squashMessage;
if (commitMessage) {
return commitMessage;
}
return await this.repository.getCommitTemplate();