Expose diff whitespace settings by darthkurak · Pull Request #2007 · libgit2/libgit2sharp · GitHub
Skip to content

Expose diff whitespace settings #2007

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
darthkurak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose diff whitespace settings #2007

Show file tree
Hide file tree
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
25 changes: 25 additions & 0 deletions LibGit2Sharp/CompareOptions.cs
View file
Open in desktop
18 changes: 17 additions & 1 deletion LibGit2Sharp/Diff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,22 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]
options.Flags |= GitDiffOptionFlags.GIT_DIFF_MINIMAL;
}

if (compareOptions.WhitespaceMode != null)
{
if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreAllWhitespaces)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE;
}
else if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreWhitespaceChange)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_CHANGE;
}
else
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_EOL;
}
}
Comment on lines +61 to +75

@amis92 amis92 Feb 28, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a thought:

Suggested change


if (diffOptions.HasFlag(DiffModifiers.DisablePathspecMatch))
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_DISABLE_PATHSPEC_MATCH;
Expand Down Expand Up @@ -546,7 +562,7 @@ private DiffHandle BuildDiffList(

MatchedPathsAggregator matchedPaths = null;

// We can't match paths unless we've got something to match
// We can't match paths unless we've got something to match
// against and we're told to do so.
if (filePaths != null && explicitPathsOptions != null)
{
Expand Down