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

joaomoreno · web-flow · commit 57f08f6b748b · 2020-06-29T16:16:34.000+02:00
Adding .git/SQUASH_MSG detection to commit message auto-fill microsoft#101078
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -1939,6 +1939,17 @@ export class Repository {
 		return message.replace(/^\s*#.*$\n?/gm, '').trim();
 	}
 
+	async getSquashMessage(): Promise<string | undefined> {
+		const squashMsgPath = path.join(this.repositoryRoot, '.git', 'SQUASH_MSG');
+
+		try {
+			const raw = await fs.readFile(squashMsgPath, 'utf8');
+			return this.stripCommitMessageComments(raw);
+		} catch {
+			return undefined;
+		}
+	}
+
 	async getMergeMessage(): Promise<string | undefined> {
 		const mergeMsgPath = path.join(this.repositoryRoot, '.git', 'MERGE_MSG');
 
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -865,10 +865,10 @@ export class Repository implements Disposable {`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`async getInputTemplate(): Promise<string> {`
`868`		`- const mergeMessage = await this.repository.getMergeMessage();`
	`868`	`+ const commitMessage = (await Promise.all([this.repository.getMergeMessage(), this.repository.getSquashMessage()])).find(msg => msg !== undefined);`
`869`	`869`
`870`		`- if (mergeMessage) {`
`871`		`- return mergeMessage;`
	`870`	`+ if (commitMessage) {`
	`871`	`+ return commitMessage;`
`872`	`872`	`}`
`873`	`873`
`874`	`874`	`return await this.repository.getCommitTemplate();`