Skip to content

Commit

Permalink
Merge: Disable external git-diff drivers
Browse files Browse the repository at this point in the history
Fixes #174.

Suggested-by: Aaron L. Zeng <me@bcc32.com>
  • Loading branch information
alphapapa committed Aug 31, 2024
2 parents 501c8db + 605433d commit 60b6bd9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ Note that if TRAMP can't find the scanner configured in option ~magit-todos-scan
*Removals*
+ Obsolete option ~magit-todos-insert-at~, replaced by option ~magit-todos-insert-after~. (Scheduled for removal since v1.6.)

*Fixes*
+ Disable external diff drivers when calling ~git diff~. ([[https://github.com/alphapapa/magit-todos/pull/174][#174]]. Thanks to [[https://github.com/bcc32][Aaron Zeng]].)

** 1.7.2

*Fixes*
Expand Down
2 changes: 1 addition & 1 deletion magit-todos.el
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,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"
Expand Down

0 comments on commit 60b6bd9

Please sign in to comment.