Fix issue display local branches containing forward slash

Signed-off-by: Jacob Stopak <jacob@initialcommit.io>

Author: initialcommit-io

git_sim/git_sim_base_command.py

@@ -319,10 +319,10 @@ def draw_branch(self, commit):
             # Use forward slash to check if branch is local or remote tracking
             # and draw the branch label if its hexsha matches the current commit
             if (
-                "/" not in branch  # local branch
+                not self.is_remote_tracking_branch(branch)  # local branch
                 and commit.hexsha == self.repo.heads[branch].commit.hexsha
             ) or (
-                "/" in branch  # remote tracking branch
+                self.is_remote_tracking_branch(branch)  # remote tracking branch
                 and commit.hexsha == remote_tracking_branches[branch]
             ):
                 branchText = m.Text(
@@ -954,6 +954,15 @@ def get_remote_tracking_branches(self):
                     remote_tracking_branches[ref.name] = ref.commit.hexsha
         return remote_tracking_branches
 
+    def is_remote_tracking_branch(self, branch):
+        remote_refs = [remote.refs for remote in self.repo.remotes]
+        remote_tracking_branches = {}
+        for reflist in remote_refs:
+            for ref in reflist:
+                if "HEAD" not in ref.name and ref.name not in remote_tracking_branches:
+                    remote_tracking_branches[ref.name] = ref.commit.hexsha
+        return branch in remote_tracking_branches
+
 
 class DottedLine(m.Line):
     def __init__(self, *args, dot_spacing=0.4, dot_kwargs={}, **kwargs):

git_sim/git_sim_merge.py

@@ -57,7 +57,7 @@ def execute(self):
         self.get_commits(start=self.scene.args.branch[0])
 
         # Use forward slash to determine if supplied branch arg is local or remote tracking branch
-        if "/" not in self.scene.args.branch[0]:
+        if not self.is_remote_tracking_branch(self.scene.args.branch[0]):
             if self.scene.args.branch[0] in self.repo.git.branch(
                 "--contains", self.orig_commits[0].hexsha
             ):