From 05e719bede1dc28fa4cb57029f5732b90ff27e1d Mon Sep 17 00:00:00 2001
From: Daniel Davis <danieldavis@daniels-mbp.home>
Date: Fri, 26 Jun 2020 13:26:40 +0100
Subject: [PATCH] Changing auto-fill commit message to check for
 getMergeMessage OR getSquashMessage

---
 extensions/git/src/repository.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 7d6b77432e3..fbc0619ddeb 100644
--- 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();