Fix bug in merge subcommand due to removed method is_remote_tracking_…

…branch() Signed-off-by: Jacob Stopak <jacob@initialcommit.io>
initialcommit-com · Jun 12, 2023 · 6639de2 · 6639de2
1 parent 7030163
commit 6639de2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git_sim/merge.py b/git_sim/merge.py
@@ -60,7 +60,7 @@ def construct(self):
         head_commit = self.get_commit()
         branch_commit = self.get_commit(self.branch)
 
-        if not self.is_remote_tracking_branch(self.branch):
+        if self.branch not in self.get_remote_tracking_branches():
             if self.branch in self.repo.git.branch("--contains", head_commit.hexsha):
                 self.ff = True
         else: