From 406432cd53c168390221ae37a41724eda5b867c9 Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Wed, 29 Oct 2025 11:39:43 +0530
Subject: Change singleton terminal escaping + ts face changes

---
 autoload/git.kak | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

(limited to 'autoload/git.kak')

diff --git a/autoload/git.kak b/autoload/git.kak
index 2cc3228..76485ab 100644
--- a/autoload/git.kak
+++ b/autoload/git.kak
@@ -9,8 +9,6 @@ declare-user-mode git-r
 map global user g ': enter-user-mode git<ret>' -docstring 'Git mode'
 map global git s ': gitui<ret>' -docstring 'Git tui'
 map global git A ': git add %val{buffile}<ret>' -docstring 'Add file'
-map global git c ': git add commit<ret>' -docstring 'Commit'
-map global git C ': git add commit --amend<ret>' -docstring 'Amend commit'
 map global git m ': git-line-blame<ret>' -docstring 'Blame selection lines'
 
 map global git r ': enter-user-mode git-r<ret>' -docstring 'Git re(base/set) mode'
@@ -31,26 +29,6 @@ define-command git-toggle-diff %{
 }
 
 define-command git-line-blame %{
-  evaluate-commands %sh{
-    file="${kak_buffile}"
-    line="$(echo "$kak_selection_desc" | sed -E 's/\.[0-9]+//g')"
-    echo "terminal sh -c \"git --no-pager log -u -L '$line:$file' --color=always | delta\""
-  }
+  terminal-singleton git-blame sh -c \
+    "git -p log -u -L '%sh{echo ""$kak_selection_desc"" | sed -E 's/\.[0-9]+//g'}:%val{buffile}' --color=always"
 }
-
-# TODO: Toggle this
-# hook global -group git-diff-if-repo EnterDirectory .* %{
-#   remove-hooks global git-diff
-#   try %{
-#     evaluate-commands %sh{
-#       if (git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-#         echo "
-#           hook global -group git-diff ModeChange .*:.*:normal %{ try %{git update-diff} }
-#           hook global -group git-diff WinCreate .* %{ try %{git update-diff} }
-#           hook global -group git-diff BufReload .* %{ try %{git update-diff} }
-#         "
-#       fi
-#     }
-#   }
-# }
-
-- 
cgit v1.3.1