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

Merge pull request #101114 from daniel-j-davis/feature/add-git-squash-message

Browse Source 
Adding .git/SQUASH_MSG detection to commit message auto-fill #101078
This commit is contained in:
João Moreno
2020-06-29 16:16:34 +02:00
committed by GitHub
parent d5d40af8e7 df1575d529
commit 57f08f6b74
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -865,10 +865,10 @@ export class Repository implements Disposable {
}
async getInputTemplate(): Promise<string> {
const mergeMessage = await this.repository.getMergeMessage();
const commitMessage = (await Promise.all([this.repository.getMergeMessage(), this.repository.getSquashMessage()])).find(msg => msg !== undefined);
if (mergeMessage) {
return mergeMessage;
if (commitMessage) {
return commitMessage;
}
return await this.repository.getCommitTemplate();