Add branch name validation and whitespace config

extensions/git/package.json

@@ -922,6 +922,16 @@
             "usesOnlineServices"
           ]
         },
+        "git.createBranchNameConvention.regexp": {
+          "type": "string",
+          "description": "%config.createBranchNameConvention.regexp%",
+          "default": ""
+        },
+        "git.createBranchWhitespaceChar": {
+          "type": "string",
+          "description": "%config.createBranchWhitespaceChar%",
+          "default": "-"
+        },
         "git.confirmSync": {
           "type": "boolean",
           "description": "%config.confirmSync%",

extensions/git/package.nls.json

@@ -70,6 +70,8 @@
 	"config.checkoutType.local": "Show only local branches.",
 	"config.checkoutType.tags": "Show only tags.",
 	"config.checkoutType.remote": "Show only remote branches.",
+	"config.createBranchNameConvention.regexp": "The regex that is used to match create branch against convention.",
+	"config.createBranchWhitespaceChar": "The char to replace whitespace in branch name when creating branch.",
 	"config.ignoreLegacyWarning": "Ignores the legacy Git warning.",
 	"config.ignoreMissingGitWarning": "Ignores the warning when Git is missing.",
 	"config.ignoreLimitWarning": "Ignores the warning when there are too many changes in a repository.",
@@ -93,4 +95,4 @@
 	"colors.ignored": "Color for ignored resources.",
 	"colors.conflict": "Color for resources with conflicts.",
 	"colors.submodule": "Color for submodule resources."
-}
+}

extensions/git/src/commands.ts

@@ -1222,19 +1222,32 @@ export class CommandCenter {
 		await choice.run(repository);
 	}
 
+	private removeBranchNameWhitespace(name: string) {
+		const config = workspace.getConfiguration('git');
+		return name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, config.createBranchWhitespaceChar);
+	}
+
 	@command('git.branch', { repository: true })
 	async branch(repository: Repository): Promise<void> {
+		const config = workspace.getConfiguration('git');
+		const validateName = new RegExp(config.createBranchNameConvention.regexp);
 		const result = await window.showInputBox({
 			placeHolder: localize('branch name', "Branch name"),
 			prompt: localize('provide branch name', "Please provide a branch name"),
-			ignoreFocusOut: true
+			ignoreFocusOut: true,
+			validateInput: (name: string) => {
+				if (validateName.test(this.removeBranchNameWhitespace(name))) {
+					return null;
+				}
+				return `${localize('branch name format invalid', "Have to be in the format")} : ${config.createBranchNameConvention.regexp}`;
+			}
 		});
 
 		if (!result) {
 			return;
 		}
 
-		const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
+		const name = this.removeBranchNameWhitespace(result);
 		await repository.branch(name, true);
 	}