From b2ced29f5023f5a6a037d57c0356aa31235113b9 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Sun, 10 Mar 2024 20:42:32 -0400 Subject: [PATCH] Disable external diff tools when calling git diff External diffing tools are likely to produce output in a different format than git diff, or output that is not intended for programmatic consumption. --- magit-todos.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magit-todos.el b/magit-todos.el index 37192030..66ec2f63 100644 --- a/magit-todos.el +++ b/magit-todos.el @@ -1409,7 +1409,7 @@ When SYNC is non-nil, match items are returned." shell-command-to-string string-trim))) (unless (string-empty-p merge-base-ref) - (list "git" "--no-pager" "diff" "--no-color" "-U0" merge-base-ref)))) + (list "git" "--no-pager" "diff" "--no-ext-diff" "--no-color" "-U0" merge-base-ref)))) :callback 'magit-todos--git-diff-callback) (magit-todos-defscanner "find|grep"