maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changing commit message auto-fill to use the first non-undefined message

Browse source
This commit is contained in:
Daniel Davis 2020-06-26 16:55:25 +01:00
parent 7bb8f9103e
commit b3c2e36cd4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extensions/git/src/repository.ts
View file

@ -864,8 +864,9 @@ export class Repository implements Disposable {
return toGitUri(uri, '', { replaceFileExtension: true });
}
async getInputTemplate(): Promise<string> {
const commitMessage = await Promise.race([this.repository.getMergeMessage(), this.repository.getSquashMessage()]);
async getInputTemplate(): Promise<string | undefined> {
const commitMessage = (await Promise.all([this.repository.getMergeMessage(), this.repository.getSquashMessage()])).find(msg => msg !== undefined);
if (commitMessage) {
return commitMessage;
}