Changing commit message to use Promise.race instead of bad comparison

Daniel Davis · Daniel Davis · commit 7bb8f9103e49 · 2020-06-26T14:03:43.000+01:00
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -865,8 +865,7 @@ export class Repository implements Disposable {
 	}
 
 	async getInputTemplate(): Promise<string> {
-		const commitMessage = await this.repository.getMergeMessage() || await this.repository.getSquashMessage();
-
+		const commitMessage = await Promise.race([this.repository.getMergeMessage(), this.repository.getSquashMessage()]);
 		if (commitMessage) {
 			return commitMessage;
 		}

Original file line number	Diff line number	Diff line change
`@@ -865,8 +865,7 @@ export class Repository implements Disposable {`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`async getInputTemplate(): Promise<string> {`
`868`		`- const commitMessage = await this.repository.getMergeMessage() \|\| await this.repository.getSquashMessage();`
`869`		`-`
	`868`	`+ const commitMessage = await Promise.race([this.repository.getMergeMessage(), this.repository.getSquashMessage()]);`
`870`	`869`	`if (commitMessage) {`
`871`	`870`	`return commitMessage;`
`872`	`871`	`}`