10000 Added IgnoreWhitespaceChange option to MergeOptions; · jiangshengair/libgit2sharp@2fada18 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2fada18

Browse files
Evgeny Trifonovethomson
Evgeny Trifonov
authored and
ethomson
committed
Added IgnoreWhitespaceChange option to MergeOptions;
1 parent 2e3238f commit 2fada18

12 files changed

+49
-0
lines changed

‎LibGit2Sharp.Tests/MergeFixture.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,43 @@ public void CanIdentifyConflictsInMergeCommits()
865865
}
866866
}
867867

868+
[Theory]
869+
[InlineData("conflicts_spaces")]
870+
[InlineData("conflicts_tabs")]
871+
public void CanConflictOnWhitespaceChangeMergeConflict(string branchName)
872+
{
873+
string path = SandboxMergeTestRepo();
874+
using (var repo = new Repository(path))
875+
{
876+
var mergeResult = repo.Merge(branchName, Constants.Signature, new MergeOptions());
877+
Assert.Equal(MergeStatus.Conflicts, mergeResult.Status);
878+
879+
var master = repo.Branches["master"];
880+
var branch = repo.Branches[branchName];
881+
var mergeTreeResult = repo.ObjectDatabase.MergeCommits(master.Tip, branch.Tip, new MergeTreeOptions());
882+
Assert.Equal(MergeTreeStatus.Conflicts, mergeTreeResult.Status);
883+
}
884+
}
885+
886+
[Theory]
887+
[InlineData("conflicts_spaces")]
888+
[InlineData("conflicts_tabs")]
889+
public void CanIgnoreWhitespaceChangeMergeConflict(string branchName)
890+
{
891+
string path = SandboxMergeTestRepo();
892+
using (var repo = new Repository(path))
893+
{
894+
var mergeResult = repo.Merge(branchName, Constants.Signature, new MergeOptions() { IgnoreWhitespaceChange = true });
895+
Assert.NotEqual(MergeStatus.Conflicts, mergeResult.Status);
896+
897+
var master = repo.Branches["master"];
898+
var branch = repo.Branches[branchName];
899+
var mergeTreeResult = repo.ObjectDatabase.MergeCommits(master.Tip, branch.Tip, new MergeTreeOptions() { IgnoreWhitespaceChange = true });
900+
Assert.NotEqual(MergeTreeStatus.Conflicts, mergeTreeResult.Status);
901+
Assert.Empty(mergeTreeResult.Conflicts);
902+
}
903+
}
904+
868905
private Commit AddFileCommitToRepo(IRepository repository, string filename, string content = null)
869906
{
870907
Touch(repository.Info.WorkingDirectory, filename, content);

‎LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/index

33 Bytes
Binary file not shown.

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

68 Bytes
Binary file not shown.

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

69 Bytes
Binary file not shown.

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

166 Bytes
Binary file not shown.

‎LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/objects/96/adea09cb7c3e9e81e488fbf0bc29e61d8100be

76 Bytes
Binary file not shown.

‎LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/objects/cf/2badd0f483ffe19755560e6f736f1b4621f737

75 Bytes
Binary file not shown.

‎LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/objects/e5/5b31220c73a5535ba58709791880f3035849d4

167 Bytes
Binary file not shown.

‎LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/refs/heads/conflicts_spaces

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
79853dbb13f5e83a1e9e69bf747c5a667c21d420

‎LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/refs/heads/conflicts_tabs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e55b31220c73a5535ba58709791880f3035849d4

0 commit comments

Comments
 (0)
0