From fe64f2f4c9d79df44f31b549352eefce2b2c5c8b Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 23 Sep 2020 19:52:52 +1000 Subject: use --no-ext-diff flag for git diff --- pkg/commands/git_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/commands/git_test.go') diff --git a/pkg/commands/git_test.go b/pkg/commands/git_test.go index 0991b96cd..d6761148b 100644 --- a/pkg/commands/git_test.go +++ b/pkg/commands/git_test.go @@ -1408,7 +1408,7 @@ func TestGitCommandDiff(t *testing.T) { "Default case", func(cmd string, args ...string) *exec.Cmd { assert.EqualValues(t, "git", cmd) - assert.EqualValues(t, []string{"diff", "--color=always", "--", "test.txt"}, args) + assert.EqualValues(t, []string{"diff", "--no-ext-diff", "--color=always", "--", "test.txt"}, args) return exec.Command("echo") }, @@ -1424,7 +1424,7 @@ func TestGitCommandDiff(t *testing.T) { "cached", func(cmd string, args ...string) *exec.Cmd { assert.EqualValues(t, "git", cmd) - assert.EqualValues(t, []string{"diff", "--color=always", "--cached", "--", "test.txt"}, args) + assert.EqualValues(t, []string{"diff", "--no-ext-diff", "--color=always", "--cached", "--", "test.txt"}, args) return exec.Command("echo") }, @@ -1440,7 +1440,7 @@ func TestGitCommandDiff(t *testing.T) { "plain", func(cmd string, args ...string) *exec.Cmd { assert.EqualValues(t, "git", cmd) - assert.EqualValues(t, []string{"diff", "--color=never", "--", "test.txt"}, args) + assert.EqualValues(t, []string{"diff", "--no-ext-diff", "--color=never", "--", "test.txt"}, args) return exec.Command("echo") }, @@ -1456,7 +1456,7 @@ func TestGitCommandDiff(t *testing.T) { "File not tracked and file has no staged changes", func(cmd string, args ...string) *exec.Cmd { assert.EqualValues(t, "git", cmd) - assert.EqualValues(t, []string{"diff", "--color=always", "--no-index", "/dev/null", "test.txt"}, args) + assert.EqualValues(t, []string{"diff", "--no-ext-diff", "--color=always", "--no-index", "/dev/null", "test.txt"}, args) return exec.Command("echo") }, -- cgit v1.2.3