From 16f17b0f22e108b7449c68567ecd61196af56a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCbscher?= Date: Sat, 4 Apr 2020 21:19:14 +0200 Subject: [PATCH] Use PatchWhitespaceMode to build git diff options. --- LibGit2Sharp/Diff.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs index 087ee8d6d..7420b360e 100644 --- a/LibGit2Sharp/Diff.cs +++ b/LibGit2Sharp/Diff.cs @@ -68,6 +68,21 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[] options.Flags |= GitDiffOptionFlags.GIT_DIFF_INDENT_HEURISTIC; } + switch (compareOptions.PatchWhitespaceMode) + { + case PatchWhitespaceMode.DontIgnoreWhitespace: + break; + case PatchWhitespaceMode.IgnoreAllWhitespace: + options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE; + break; + case PatchWhitespaceMode.IgnoreWhitespaceChange: + options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_CHANGE; + break; + case PatchWhitespaceMode.IgnoreWhitespaceEol: + options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_EOL; + break; + } + if (matchedPathsAggregator != null) { options.NotifyCallback = matchedPathsAggregator.OnGitDiffNotify;