Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable external diff tools when calling git diff #174

Merged
merged 2 commits into from
Aug 31, 2024
Merged

Disable external diff tools when calling git diff #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db8837
Disable external diff tools when calling git diff
bcc32 Mar 11, 2024
605433d
Docs: Update changelog
alphapapa Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.org
View file
Open in desktop
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
View file
Open in desktop
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