mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-06-20 01:19:23 +02:00
Fix patch commands when git config has color=always
This is the same option as used by pkg.commands.git_commands.diff.GetDiff().
This commit is contained in:
committed by
Stefan Haller
parent
afcfc61113
commit
590d6f2f80
@@ -346,7 +346,7 @@ func (self *PatchCommands) PullPatchIntoNewCommitBefore(
|
|||||||
func (self *PatchCommands) diffHeadAgainstCommit(commit *models.Commit) (string, error) {
|
func (self *PatchCommands) diffHeadAgainstCommit(commit *models.Commit) (string, error) {
|
||||||
cmdArgs := NewGitCmd("diff").
|
cmdArgs := NewGitCmd("diff").
|
||||||
Config("diff.noprefix=false").
|
Config("diff.noprefix=false").
|
||||||
Arg("--no-ext-diff").
|
Arg("--no-ext-diff", "--no-color").
|
||||||
Arg("HEAD.." + commit.Hash()).
|
Arg("HEAD.." + commit.Hash()).
|
||||||
ToArgv()
|
ToArgv()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user