Reset highlighting for branch moved under commit

rbong · Aug 21, 2024 · 688f9e1 · 688f9e1
1 parent 68e3d84
commit 688f9e1
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lua/flog/graph.lua b/lua/flog/graph.lua
@@ -674,7 +674,7 @@ function M.get_graph(
             end
           end
 
-          -- Update moved commit branch highlighting
+          -- Update commit branch highlighting to parent branch
           if is_nvim and ncommit_parents == 1 and ncommit_new_parents == 1 then
             local parent_branch_index = branch_indexes[commit_new_parents[1]]
             local new_parent_hl = current_hl[commit_branch_index]
@@ -921,6 +921,15 @@ function M.get_graph(
         end
       end
 
+      -- Reset branch highlighting for moved parent branch
+      if should_move_last_parent_under_commit then
+        local new_hl = (commit_merge_end_branch_index - 1) % 9 + 1
+        if new_hl ~= current_hl[commit_merge_end_branch_index] then
+          next_commit_hl[commit_merge_end_branch_index] = new_hl
+          current_hl[commit_merge_end_branch_index] = new_hl
+        end
+      end
+
       -- Reset branch highlighting for removed missing branches
       for missing_parent_index = 1, nmissing_parents do
         local branch_index = branch_indexes[missing_parents[missing_parent_index]]