From 7ddd7cb5901bec14d2a5e7f88e07047b5216ad06 Mon Sep 17 00:00:00 2001
From: Randy Lai <randy.cs.lai@gmail.com>
Date: Wed, 7 Mar 2018 15:29:18 -0500
Subject: [PATCH] Fix: use check-ref-format to check branch name validity

---
 core/commands/checkout.py   | 15 +++++++--------
 core/git_mixins/branches.py |  4 ++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/commands/checkout.py b/core/commands/checkout.py
index c425bc505..d234e9b81 100644
--- a/core/commands/checkout.py
+++ b/core/commands/checkout.py
@@ -1,16 +1,14 @@
-import re
 import sublime
 from sublime_plugin import WindowCommand
 
 from ..git_command import GitCommand
+from ..exceptions import GitSavvyError
 from ...common import util
 from ..ui_mixins.quick_panel import show_branch_panel
 
 
 NEW_BRANCH_PROMPT = "Branch name:"
 NEW_BRANCH_INVALID = "`{}` is a invalid branch name.\nRead more on $(man git-check-ref-format)"
-_is_valid_branch_name = re.compile(
-    r"^(?!\.|.*\.\..*|.*@.*|\/)[a-zA-Z0-9\-\_\/\.#\u263a-\U0001f645]+(?<!\.lock)(?<!\/)(?<!\.)$")
 
 
 class GsCheckoutBranchCommand(WindowCommand, GitCommand):
@@ -57,8 +55,9 @@ def run_async(self, base_branch=None):
         v.run_command("select_all")
 
     def on_done(self, branch_name):
-        match = _is_valid_branch_name.match(branch_name)
-        if not match:
+        try:
+            self.validate_branch_name(branch_name)
+        except GitSavvyError:
             sublime.error_message(NEW_BRANCH_INVALID.format(branch_name))
             sublime.set_timeout_async(self.run_async(branch_name))
             return None
@@ -109,9 +108,9 @@ def on_branch_selection(self, remote_branch, local_name=None):
         v.run_command("select_all")
 
     def on_enter_local_name(self, branch_name):
-
-        match = _is_valid_branch_name.match(branch_name)
-        if not match:
+        try:
+            self.validate_branch_name(branch_name)
+        except GitSavvyError:
             sublime.error_message(NEW_BRANCH_INVALID.format(branch_name))
             sublime.set_timeout_async(self.on_branch_selection(self.remote_branch, branch_name))
             return None
diff --git a/core/git_mixins/branches.py b/core/git_mixins/branches.py
index 022003d13..772a437a2 100644
--- a/core/git_mixins/branches.py
+++ b/core/git_mixins/branches.py
@@ -97,3 +97,7 @@ def branches_containing_commit(self, commit_hash, local_only=True, remote_only=F
             commit_hash
         ).strip().split("\n")
         return [branch.strip() for branch in branches]
+
+    def validate_branch_name(self, branch):
+        ref = "refs/heads/{}".format(branch)
+        self.git("check-ref-format", "--branch", ref)