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

Daniel Davis · Daniel Davis · commit 05e719bede1d · 2020-06-26T13:26:40.000+01:00
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -865,13 +865,10 @@ export class Repository implements Disposable {`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`async getInputTemplate(): Promise<string> {`
`868`		`- const mergeMessage = await this.repository.getMergeMessage();`
`869`		`- const squashMessage = await this.repository.getSquashMessage();`
	`868`	`+ const commitMessage = await this.repository.getMergeMessage() \|\| await this.repository.getSquashMessage();`
`870`	`869`
`871`		`- if (mergeMessage) {`
`872`		`- return mergeMessage;`
`873`		`- } else if (squashMessage) {`
`874`		`- return squashMessage;`
	`870`	`+ if (commitMessage) {`
	`871`	`+ return commitMessage;`
`875`	`872`	`}`
`876`	`873`
`877`	`874`	`return await this.repository.getCommitTemplate();`