Merge pull request #1227 from tomcsmith1990/minimal-diff-algorithm

nulltoken · nulltoken · commit e90dc974ba79 · 2015-11-04T12:19:27.000+01:00
Expose the Minimal diff algorithm
diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs
@@ -53,6 +53,10 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]
             {
                 options.Flags |= GitDiffOptionFlags.GIT_DIFF_PATIENCE;
             }
+            else if (compareOptions.Algorithm == DiffAlgorithm.Minimal)
+            {
+                options.Flags |= GitDiffOptionFlags.GIT_DIFF_MINIMAL;
+            }
 
             if (diffOptions.HasFlag(DiffModifiers.DisablePathspecMatch))
             {
diff --git a/LibGit2Sharp/DiffAlgorithm.cs b/LibGit2Sharp/DiffAlgorithm.cs
@@ -10,6 +10,11 @@ public enum DiffAlgorithm
         /// </summary>
         Myers = 0,
 
+        /// <summary>
+        /// Use "minimal diff" algorithm when generating patches.
+        /// </summary>
+        Minimal = 1,
+
         /// <summary>
         /// Use "patience diff" algorithm when generating patches.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]`
`53`	`53`	`{`
`54`	`54`	`options.Flags \|= GitDiffOptionFlags.GIT_DIFF_PATIENCE;`
`55`	`55`	`}`
	`56`	`+ else if (compareOptions.Algorithm == DiffAlgorithm.Minimal)`
	`57`	`+ {`
	`58`	`+ options.Flags \|= GitDiffOptionFlags.GIT_DIFF_MINIMAL;`
	`59`	`+ }`
`56`	`60`
`57`	`61`	`if (diffOptions.HasFlag(DiffModifiers.DisablePathspecMatch))`
`58`	`62`	`{`