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 (#5405)
This is the same option as used by pkg.commands.git_commands.diff.GetDiff(). This fixes some operations patch operation (tested with moving patch to another commit) with `git config set --global color.ui always` (or `color.diff always`).
This commit is contained in:
@@ -346,7 +346,7 @@ func (self *PatchCommands) PullPatchIntoNewCommitBefore(
|
||||
func (self *PatchCommands) diffHeadAgainstCommit(commit *models.Commit) (string, error) {
|
||||
cmdArgs := NewGitCmd("diff").
|
||||
Config("diff.noprefix=false").
|
||||
Arg("--no-ext-diff").
|
||||
Arg("--no-ext-diff", "--no-color").
|
||||
Arg("HEAD.." + commit.Hash()).
|
||||
ToArgv()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user