Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding .git/SQUASH_MSG detection to commit message autofill

Browse Source
This commit is contained in:
Daniel Davis
2020-06-26 12:35:32 +01:00
parent 277627c090
commit 3f90d90ab2
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/git/src/git.ts
View File

@@ -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');

3
extensions/git/src/repository.ts
View File

@@ -866,9 +866,12 @@ export class Repository implements Disposable {
async getInputTemplate(): Promise<string> {
const mergeMessage = await this.repository.getMergeMessage();
const squashMessage = await this.repository.getSquashMessage();
if (mergeMessage) {
return mergeMessage;
} else if (squashMessage) {
return squashMessage;
}
return await this.repository.getCommitTemplate();