Skip to content

Commit b788897

Browse files
wvfflechrisgrieser
authored andcommitted
fix(staging): disable external diff tools
1 parent 8332b4a commit b788897

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lua/tinygit/commands/stage.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ function M.interactiveStaging()
157157
-- GET ALL HUNKS
158158
u.intentToAddUntrackedFiles() -- include untracked files, enables using `--diff-filter=A`
159159
local contextSize = require("tinygit.config").config.stage.contextSize
160-
local diffArgs = { "git", "diff", "--unified=" .. contextSize, "--diff-filter=ADMR" }
160+
local diffArgs =
161+
{ "git", "diff", "--no-ext-diff", "--unified=" .. contextSize, "--diff-filter=ADMR" }
161162
-- no trimming, since trailing empty lines can be blank context lines in diff output
162163
local changesDiff = u.syncShellCmd(diffArgs, "notrim")
163164
local changedHunks = getHunksFromDiffOutput(changesDiff, false)

0 commit comments

Comments
 (0)