diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index dc1774aea46c84ae92bfb32cc3acc7291444444c..57a1701510e4547f04fe76d31088f32c620dc6e3 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -979,6 +979,7 @@ export class CommandCenter { } return await window.showInputBox({ + value: opts && opts.defaultMsg, placeHolder: localize('commit message', "Commit message"), prompt: localize('provide commit message', "Please provide a commit message"), ignoreFocusOut: true @@ -1022,7 +1023,15 @@ export class CommandCenter { @command('git.commitStagedAmend', { repository: true }) async commitStagedAmend(repository: Repository): Promise { - await this.commitWithAnyInput(repository, { all: false, amend: true }); + let msg; + if (repository.HEAD) { + if (repository.HEAD.commit) { + let id = repository.HEAD.commit; + let commit = await repository.getCommit(id); + msg = commit.message; + } + } + await this.commitWithAnyInput(repository, { all: false, amend: true, defaultMsg: msg }); } @command('git.commitAll', { repository: true }) diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index 826b27bff8ae4d5d9c1a9d1386580aa2a0136ba6..93e8386e44015a23b31df6713c2e5a99a5de1850 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -374,6 +374,7 @@ export interface CommitOptions { amend?: boolean; signoff?: boolean; signCommit?: boolean; + defaultMsg?: string; } export interface GitResourceGroup extends SourceControlResourceGroup {