Skip to content

[enhancement] Add flag '--ignore-blank-lines' when ignoring whitespace #2455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
goran-w wants to merge 1 commit into
base: develop
Choose a base branch
from
+3 −3
Open

[enhancement] Add flag '--ignore-blank-lines' when ignoring whitespace #2455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Commands/Diff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public partial class Diff : Command
private const string PREFIX_LFS_DEL = "-version https://git-lfs.github.com/spec/";
private const string PREFIX_LFS_MODIFY = " version https://git-lfs.github.com/spec/";

public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespace, bool ignoreCRAtEOL)
public Diff(string repo, Models.DiffOption opt, int numContextLines, bool ignoreWhitespace, bool ignoreCRAtEOL)
{
_result.TextDiff = new Models.TextDiff();

Expand All @@ -30,10 +30,10 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
var builder = new StringBuilder(256);
builder.Append("diff --no-color --no-ext-diff --full-index --patch ");
if (ignoreWhitespace)
builder.Append("--ignore-space-change ");
builder.Append("--ignore-space-change --ignore-blank-lines ");
if (ignoreCRAtEOL)
builder.Append("--ignore-cr-at-eol ");
builder.Append("--unified=").Append(unified).Append(' ');
builder.Append("--unified=").Append(numContextLines).Append(' ');
builder.Append(opt.ToString());

Args = builder.ToString();
Expand Down