Take account of CompareOptions.IndentHeuristic

When this flag is set, enable the GIT_DIFF_INDENT_HEURISTIC option.

Author: jcansdale

LibGit2Sharp/Core/GitDiff.cs

@@ -133,6 +133,13 @@ internal enum GitDiffOptionFlags
          * Options controlling how output will be generated
          */
 
+        /// <summary>
+        /// Use a heuristic that takes indentation and whitespace into account
+        /// which generally can produce better diffs when dealing with ambiguous
+        /// diff hunks.
+        /// </summary>
+        GIT_DIFF_INDENT_HEURISTIC = (1 << 18),
+
         /// <summary>
         /// Treat all files as text, disabling binary attributes and detection
         /// </summary>
@@ -304,11 +311,11 @@ enum GitDiffLineOrigin : byte
 
     enum GitDiffFormat
     {
-        GIT_DIFF_FORMAT_PATCH        = 1, // < full git diff
+        GIT_DIFF_FORMAT_PATCH = 1, // < full git diff
         GIT_DIFF_FORMAT_PATCH_HEADER = 2, // < just the file headers of patch
-        GIT_DIFF_FORMAT_RAW          = 3, // < like git diff --raw
-        GIT_DIFF_FORMAT_NAME_ONLY    = 4, // < like git diff --name-only
-        GIT_DIFF_FORMAT_NAME_STATUS  = 5, // < like git diff --name-status
+        GIT_DIFF_FORMAT_RAW = 3, // < like git diff --raw
+        GIT_DIFF_FORMAT_NAME_ONLY = 4, // < like git diff --name-only
+        GIT_DIFF_FORMAT_NAME_STATUS = 5, // < like git diff --name-status
     }
 
     [Flags]

LibGit2Sharp/Diff.cs

@@ -63,6 +63,11 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]
                 options.Flags |= GitDiffOptionFlags.GIT_DIFF_DISABLE_PATHSPEC_MATCH;
             }
 
+            if (compareOptions.IndentHeuristic)
+            {
+                options.Flags |= GitDiffOptionFlags.GIT_DIFF_INDENT_HEURISTIC;
+            }
+
             if (matchedPathsAggregator != null)
             {
                 options.NotifyCallback = matchedPathsAggregator.OnGitDiffNotify;
@@ -351,7 +356,7 @@ public virtual T Compare<T>(Tree oldTree, DiffTargets diffTargets, IEnumerable<s
             }
 
             DiffHandle diff = BuildDiffList(oldTreeId, null, comparer, diffOptions, paths, explicitPathsOptions, compareOptions);
-            
+
             try
             {
                 return BuildDiffResult<T>(diff);