go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-04 10:34:55 +02:00
Code Issues Releases Activity

use --no-ext-diff flag for git diff

Browse Source
This commit is contained in:
Jesse Duffield 2020-09-23 19:52:52 +10:00
parent 03ea4a884a
commit fe64f2f4c9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/commands/git.go
View File

@ -788,7 +788,7 @@ func (c *GitCommand) WorktreeFileDiffCmdStr(file *File, plain bool, cached bool)
colorArg = "never" colorArg = "never"
} }
return fmt.Sprintf("git diff --color=%s %s %s %s", colorArg, cachedArg, trackedArg, fileName) return fmt.Sprintf("git diff --no-ext-diff --color=%s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
} }
func (c *GitCommand) ApplyPatch(patch string, flags ...string) error { func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
@ -1068,7 +1068,7 @@ func (c *GitCommand) GetFilesInDiff(from string, to string, reverse bool, patchM
reverseFlag = " -R " reverseFlag = " -R "
} }
filenames, err := c.OSCommand.RunCommandWithOutput("git diff --name-status %s %s %s", reverseFlag, from, to) filenames, err := c.OSCommand.RunCommandWithOutput("git diff --no-ext-diff --name-status %s %s %s", reverseFlag, from, to)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1121,7 +1121,7 @@ func (c *GitCommand) ShowFileDiffCmdStr(from string, to string, reverse bool, fi
reverseFlag = " -R " reverseFlag = " -R "
} }
return fmt.Sprintf("git diff --no-renames --color=%s %s %s %s -- %s", colorArg, from, to, reverseFlag, fileName) return fmt.Sprintf("git diff --no-ext-diff --no-renames --color=%s %s %s %s -- %s", colorArg, from, to, reverseFlag, fileName)
} }
// CheckoutFile checks out the file for the given commit // CheckoutFile checks out the file for the given commit

8
pkg/commands/git_test.go
View File

@ -1408,7 +1408,7 @@ func TestGitCommandDiff(t *testing.T) {
"Default case", "Default case",
func(cmd string, args ...string) *exec.Cmd { func(cmd string, args ...string) *exec.Cmd {
assert.EqualValues(t, "git", 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") return exec.Command("echo")
}, },
@ -1424,7 +1424,7 @@ func TestGitCommandDiff(t *testing.T) {
"cached", "cached",
func(cmd string, args ...string) *exec.Cmd { func(cmd string, args ...string) *exec.Cmd {
assert.EqualValues(t, "git", 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") return exec.Command("echo")
}, },
@ -1440,7 +1440,7 @@ func TestGitCommandDiff(t *testing.T) {
"plain", "plain",
func(cmd string, args ...string) *exec.Cmd { func(cmd string, args ...string) *exec.Cmd {
assert.EqualValues(t, "git", 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") return exec.Command("echo")
}, },
@ -1456,7 +1456,7 @@ func TestGitCommandDiff(t *testing.T) {
"File not tracked and file has no staged changes", "File not tracked and file has no staged changes",
func(cmd string, args ...string) *exec.Cmd { func(cmd string, args ...string) *exec.Cmd {
assert.EqualValues(t, "git", 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") return exec.Command("echo")
}, },

2
pkg/gui/diffing.go
View File

@ -14,7 +14,7 @@ func (gui *Gui) exitDiffMode() error {
func (gui *Gui) renderDiff() error { func (gui *Gui) renderDiff() error {
cmd := gui.OSCommand.ExecutableFromString( cmd := gui.OSCommand.ExecutableFromString(
fmt.Sprintf("git diff --color %s", gui.diffStr()), fmt.Sprintf("git diff --no-ext-diff --color %s", gui.diffStr()),
) )
task := gui.createRunPtyTask(cmd) task := gui.createRunPtyTask(cmd)