Fix positioning of refs after fast forward merge

Signed-off-by: Jacob Stopak <[email protected]>

Author: initialcommit-io

git_sim/git_sim_base_command.py

@@ -818,6 +818,20 @@ def reset_head_branch(self, hexsha, shift=numpy.array([0.0, 0.0, 0.0])):
                 )
             )
 
+    def reset_head_branch_to_ref(self, ref, shift=numpy.array([0.0, 0.0, 0.0])):
+        if settings.animate:
+            self.play(self.drawnRefs["HEAD"].animate.next_to(ref, m.UP))
+            self.play(
+                self.drawnRefs[self.repo.active_branch.name].animate.next_to(
+                    self.drawnRefs["HEAD"], m.UP
+                )
+            )
+        else:
+            self.drawnRefs["HEAD"].next_to(ref, m.UP)
+            self.drawnRefs[self.repo.active_branch.name].next_to(
+                self.drawnRefs["HEAD"], m.UP
+            )
+
     def translate_frame(self, shift):
         if settings.animate:
             self.play(self.camera.frame.animate.shift(shift))

git_sim/merge.py

@@ -58,7 +58,6 @@ def construct(self):
         head_commit = self.get_commit()
         branch_commit = self.get_commit(self.branch)
 
-        # Use forward slash to determine if supplied branch arg is local or remote tracking branch
         if not self.is_remote_tracking_branch(self.branch):
             if self.branch in self.repo.git.branch("--contains", head_commit.hexsha):
                 self.ff = True
@@ -82,8 +81,10 @@ def construct(self):
 
             self.recenter_frame()
             self.scale_frame()
-            if "HEAD" in self.drawnRefs:
+            if "HEAD" in self.drawnRefs and self.no_ff:
                 self.reset_head_branch(reset_head_to, shift=shift)
+            elif "HEAD" in self.drawnRefs:
+                self.reset_head_branch_to_ref(self.topref, shift=shift)
             else:
                 self.draw_ref(branch_commit, commitId if self.no_ff else self.topref)
                 self.draw_ref(