github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-22 05:40:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: always turn off --color=<when> and --ext-diff when calling git diff in SourceGit (#1922)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-11-19 10:28:36 +08:00
parent 0670cf1c08
commit 4419b734a5
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Commands/Diff.cs
View File

@@ -26,11 +26,11 @@ namespace SourceGit.Commands
Context = repo;
if (ignoreWhitespace)
Args = $"diff --no-ext-diff --patch --ignore-all-space --unified={unified} {opt}";
Args = $"diff --no-color --no-ext-diff --patch --ignore-all-space --unified={unified} {opt}";
else if (Models.DiffOption.IgnoreCRAtEOL)
Args = $"diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
Args = $"diff --no-color --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
else
Args = $"diff --no-ext-diff --patch --unified={unified} {opt}";
Args = $"diff --no-color --no-ext-diff --patch --unified={unified} {opt}";
}
public async Task<Models.DiffResult> ReadAsync()

2
src/Commands/GenerateCommitMessage.cs
View File

@@ -17,7 +17,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
Args = $"diff --diff-algorithm=minimal {opt}";
Args = $"diff --no-color --no-ext-diff --diff-algorithm=minimal {opt}";
}
public async Task<Result> ReadAsync()

2
src/Commands/IsBinary.cs
View File

@@ -12,7 +12,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
Args = $"diff {Models.Commit.EmptyTreeSHA1} {commit} --numstat -- {path.Quoted()}";
Args = $"diff --no-color --no-ext-diff --numstat {Models.Commit.EmptyTreeSHA1} {commit} -- {path.Quoted()}";
RaiseError = false;
}

2
src/Commands/IsConflictResolved.cs
View File

@@ -10,7 +10,7 @@ namespace SourceGit.Commands
WorkingDirectory = repo;
Context = repo;
Args = $"diff -a --ignore-cr-at-eol --check {opt}";
Args = $"diff --no-color --no-ext-diff -a --ignore-cr-at-eol --check {opt}";
}
public bool GetResult()

2
src/Commands/SaveChangesAsPatch.cs
View File

@@ -54,7 +54,7 @@ namespace SourceGit.Commands
var starter = new ProcessStartInfo();
starter.WorkingDirectory = repo;
starter.FileName = Native.OS.GitExecutable;
starter.Arguments = $"diff --ignore-cr-at-eol --unified=4 {opt}";
starter.Arguments = $"diff --no-color --no-ext-diff --ignore-cr-at-eol --unified=4 {opt}";
starter.UseShellExecute = false;
starter.CreateNoWindow = true;
starter.WindowStyle = ProcessWindowStyle.Hidden;