💄 commit empty

extensions/git/package.json

@@ -422,10 +422,6 @@
           "command": "git.commit",
           "when": "config.git.enabled && gitOpenRepositoryCount != 0"
         },
-        {
-          "command": "git.commitEmpty",
-          "when": "config.git.allowcommitEmptys && gitOpenRepositoryCount != 0"
-        },
         {
           "command": "git.commitStaged",
           "when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -608,11 +604,6 @@
           "group": "3_commit",
           "when": "scmProvider == git"
         },
-        {
-          "command": "git.commitEmpty",
-          "group": "3_commit",
-          "when": "scmProvider == git"
-        },
         {
           "command": "git.commitStagedSigned",
           "group": "3_commit",
@@ -1005,11 +996,11 @@
           "description": "%config.enableCommitSigning%",
           "default": false
         },
-        "git.allowEmptyCommits": {
+        "git.confirmEmptyCommits": {
           "type": "boolean",
           "scope": "resource",
-          "description": "%config.allowEmptyCommits%",
-          "default": false
+          "description": "%config.confirmEmptyCommits%",
+          "default": true
         },
         "git.decorations.enabled": {
           "type": "boolean",

extensions/git/package.nls.json

@@ -91,6 +91,7 @@
 	"config.ignoredRepositories": "List of git repositories to ignore.",
 	"config.showProgress": "Controls whether git actions should show progress.",
 	"config.rebaseWhenSync": "Use rebase instead of merge when running the sync command.",
+	"config.confirmEmptyCommits": "Always confirm the creation of empty commits.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",
 	"colors.untracked": "Color for untracked resources.",

extensions/git/src/commands.ts

@@ -6,8 +6,8 @@
 'use strict';
 
 import { Uri, commands, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn, ProgressLocation, TextEditor, MessageOptions } from 'vscode';
-import { Git } from './git';
-import { Repository, Resource, Status, CommitOptions, ResourceGroupType } from './repository';
+import { Git, CommitOptions } from './git';
+import { Repository, Resource, Status, ResourceGroupType } from './repository';
 import { Model } from './model';
 import { toGitUri, fromGitUri } from './uri';
 import { grep, isDescendant, pathEquals } from './util';
@@ -1087,11 +1087,11 @@ export class CommandCenter {
 
 		if (
 			(
-			// no changes
-			(noStagedChanges && noUnstagedChanges)
-			// or no staged changes and not `all`
-			|| (!opts.all && noStagedChanges)
-		)
+				// no changes
+				(noStagedChanges && noUnstagedChanges)
+				// or no staged changes and not `all`
+				|| (!opts.all && noStagedChanges)
+			)
 			&& !opts.empty
 		) {
 			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
@@ -1137,11 +1137,6 @@ export class CommandCenter {
 		}
 	}
 
-	@command('git.commitEmpty', { repository: true})
-	async commit(repository: Repository): Promise<void> {
-		await this.commitWithAnyInput(repository, { empty: true });
-	}
-
 	@command('git.commit', { repository: true })
 	async commit(repository: Repository): Promise<void> {
 		await this.commitWithAnyInput(repository);
@@ -1190,6 +1185,28 @@ export class CommandCenter {
 		await this.commitWithAnyInput(repository, { all: true, amend: true });
 	}
 
+	@command('git.commitEmpty', { repository: true })
+	async commitEmpty(repository: Repository): Promise<void> {
+		const root = Uri.file(repository.root);
+		const config = workspace.getConfiguration('git', root);
+		const shouldPrompt = config.get<boolean>('confirmEmptyCommits') === true;
+
+		if (shouldPrompt) {
+			const message = localize('confirm emtpy commit', "Are you sure you want to create an empty commit?");
+			const yes = localize('yes', "Yes");
+			const neverAgain = localize('yes never again', "Yes, Don't Show Again");
+			const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain);
+
+			if (pick === neverAgain) {
+				await config.update('confirmEmptyCommits', false, true);
+			} else if (pick !== yes) {
+				return;
+			}
+		}
+
+		await this.commitWithAnyInput(repository, { empty: true });
+	}
+
 	@command('git.undoCommit', { repository: true })
 	async undoCommit(repository: Repository): Promise<void> {
 		const HEAD = repository.HEAD;

extensions/git/src/git.ts

@@ -623,6 +623,14 @@ export function parseLsFiles(raw: string): LsFilesElement[] {
 		.map(([, mode, object, stage, file]) => ({ mode, object, stage, file }));
 }
 
+export interface CommitOptions {
+	all?: boolean;
+	amend?: boolean;
+	signoff?: boolean;
+	signCommit?: boolean;
+	empty?: boolean;
+}
+
 export class Repository {
 
 	constructor(
@@ -940,7 +948,7 @@ export class Repository {
 		}
 	}
 
-	async commit(message: string, opts: { all?: boolean, amend?: boolean, signoff?: boolean, signCommit?: boolean } = Object.create(null)): Promise<void> {
+	async commit(message: string, opts: CommitOptions = Object.create(null)): Promise<void> {
 		const args = ['commit', '--quiet', '--allow-empty-message', '--file', '-'];
 
 		if (opts.all) {

extensions/git/src/repository.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { commands, Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, SourceControlInputBoxValidation, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, DecorationData, Memento, SourceControlInputBoxValidationType } from 'vscode';
-import { Repository as BaseRepository, Commit, Stash, GitError, Submodule } from './git';
+import { Repository as BaseRepository, Commit, Stash, GitError, Submodule, CommitOptions } from './git';
 import { anyEvent, filterEvent, eventToPromise, dispose, find, isDescendant, IDisposable, onceEvent, EmptyDisposable, debounceEvent } from './util';
 import { memoize, throttle, debounce } from './decorators';
 import { toGitUri } from './uri';
@@ -390,14 +390,6 @@ class OperationsImpl implements Operations {
 	}
 }
 
-export interface CommitOptions {
-	all?: boolean;
-	amend?: boolean;
-	signoff?: boolean;
-	signCommit?: boolean;
-	empty?: boolean;
-}
-
 export interface GitResourceGroup extends SourceControlResourceGroup {
 	resourceStates: Resource[];
 }