Merge branch 'pr/1398'

Author: ethomson

LibGit2Sharp.Tests/MergeFixture.cs

@@ -865,6 +865,43 @@ public void CanIdentifyConflictsInMergeCommits()
             }
         }
 
+        [Theory]
+        [InlineData("conflicts_spaces")]
+        [InlineData("conflicts_tabs")]
+        public void CanConflictOnWhitespaceChangeMergeConflict(string branchName)
+        {
+            string path = SandboxMergeTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var mergeResult = repo.Merge(branchName, Constants.Signature, new MergeOptions());
+                Assert.Equal(MergeStatus.Conflicts, mergeResult.Status);
+
+                var master = repo.Branches["master"];
+                var branch = repo.Branches[branchName];
+                var mergeTreeResult = repo.ObjectDatabase.MergeCommits(master.Tip, branch.Tip, new MergeTreeOptions());
+                Assert.Equal(MergeTreeStatus.Conflicts, mergeTreeResult.Status);
+            }
+        }
+
+        [Theory]
+        [InlineData("conflicts_spaces")]
+        [InlineData("conflicts_tabs")]
+        public void CanIgnoreWhitespaceChangeMergeConflict(string branchName)
+        {
+            string path = SandboxMergeTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var mergeResult = repo.Merge(branchName, Constants.Signature, new MergeOptions() { IgnoreWhitespaceChange = true });
+                Assert.NotEqual(MergeStatus.Conflicts, mergeResult.Status);
+
+                var master = repo.Branches["master"];
+                var branch = repo.Branches[branchName];
+                var mergeTreeResult = repo.ObjectDatabase.MergeCommits(master.Tip, branch.Tip, new MergeTreeOptions() { IgnoreWhitespaceChange = true });
+                Assert.NotEqual(MergeTreeStatus.Conflicts, mergeTreeResult.Status);
+                Assert.Empty(mergeTreeResult.Conflicts);
+            }
+        }
+
         private Commit AddFileCommitToRepo(IRepository repository, string filename, string content = null)
         {
             Touch(repository.Info.WorkingDirectory, filename, content);

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/index

@@ -0,0 +1 @@
+79853dbb13f5e83a1e9e69bf747c5a667c21d420

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/objects/09/55f5468a8e493c0116872fa3e1807559bd5bb2

@@ -0,0 +1 @@
+e55b31220c73a5535ba58709791880f3035849d4

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/objects/1e/b39b79963b9acb87bb1b76a218d862b689f4cd

@@ -50,6 +50,11 @@ protected MergeOptionsBase()
         /// How to handle conflicts encountered during a merge.
         /// </summary>
         public MergeFileFavor MergeFileFavor { get; set; }
+
+        /// <summary>
+        /// Ignore changes in amount of whitespace
+        /// </summary>
+        public bool IgnoreWhitespaceChange { get; set; }
     }
 
     /// <summary>

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/objects/79/853dbb13f5e83a1e9e69bf747c5a667c21d420

@@ -1533,13 +1533,18 @@ private MergeResult NormalMerge(AnnotatedCommitHandle[] annotatedCommits, Signat
                 treeFlags |= GitMergeFlag.GIT_MERGE_SKIP_REUC;
             }
 
+            var fileFlags = options.IgnoreWhitespaceChange
+                ? GitMergeFileFlag.GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE
+                : GitMergeFileFlag.GIT_MERGE_FILE_DEFAULT;
+
             var mergeOptions = new GitMergeOpts
             {
                 Version = 1,
                 MergeFileFavorFlags = options.MergeFileFavor,
                 MergeTreeFlags = treeFlags,
                 RenameThreshold = (uint)options.RenameThreshold,
                 TargetLimit = (uint)options.TargetLimit,
+                FileFlags = fileFlags
             };
 
             bool earlyStop;