diff options
author | Dmitry Malikov <malikov.d.y@gmail.com> | 2015-05-07 10:50:44 +0300 |
---|---|---|
committer | Dmitry Malikov <malikov.d.y@gmail.com> | 2015-05-07 10:50:44 +0300 |
commit | 70d1439b606b77f02dee44e9df4da29f85972ace (patch) | |
tree | a4bf56728705b30279615e716a670ce5b1f5e234 /LibGit2Sharp | |
parent | 0b3109048f0ec3ac8fd991370c40aba69526f742 (diff) |
UsePatienceAlgorithm flag in CompareOptions, closes #1037
Diffstat (limited to 'LibGit2Sharp')
-rw-r--r-- | LibGit2Sharp/CompareOptions.cs | 5 | ||||
-rw-r--r-- | LibGit2Sharp/Diff.cs | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/LibGit2Sharp/CompareOptions.cs b/LibGit2Sharp/CompareOptions.cs index 5366ff7b..fccd7558 100644 --- a/LibGit2Sharp/CompareOptions.cs +++ b/LibGit2Sharp/CompareOptions.cs @@ -35,5 +35,10 @@ namespace LibGit2Sharp /// Include "unmodified" entries in the results. /// </summary> public bool IncludeUnmodified { get; set; } + + /// <summary> + /// Use the "patience diff" algorithm. + /// </summary> + public bool UsePatienceAlgorithm { get; set; } } } diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs index 3f2b3e46..126d4bec 100644 --- a/LibGit2Sharp/Diff.cs +++ b/LibGit2Sharp/Diff.cs @@ -49,6 +49,11 @@ namespace LibGit2Sharp options.Flags |= GitDiffOptionFlags.GIT_DIFF_INCLUDE_UNMODIFIED; } + if (compareOptions.UsePatienceAlgorithm) + { + options.Flags |= GitDiffOptionFlags.GIT_DIFF_PATIENCE; + } + if (diffOptions.HasFlag(DiffModifiers.DisablePathspecMatch)) { options.Flags |= GitDiffOptionFlags.GIT_DIFF_DISABLE_PATHSPEC_MATCH; |