From 0f966e656b40ede30c3c8ebfad6f1659907bcd20 Mon Sep 17 00:00:00 2001 From: Andrew Vos Date: Tue, 12 Apr 2022 16:26:38 +0100 Subject: [PATCH] Disable external diff tools when diffing buffer There is a bug that causes `:git show-diff` to fail when using an external diff, for example difftastic. This change ensures that we don't use an external diff tool when diffing the current buffer. --- rc/tools/git.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/tools/git.kak b/rc/tools/git.kak index 3b53ebd1..e65374c6 100644 --- a/rc/tools/git.kak +++ b/rc/tools/git.kak @@ -157,7 +157,7 @@ define-command -params 1.. \ update_diff() { ( cd_bufdir - git --no-pager diff -U0 "$kak_buffile" | perl -e ' + git --no-pager diff --no-ext-diff -U0 "$kak_buffile" | perl -e ' $flags = $ENV{"kak_timestamp"}; foreach $line () { if ($line =~ /@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))?/) {