Skip to content

Commit 6747b5e

Browse files
committed
Rename PatienceAlgorithm to UsePatienceAlgorithm
1 parent b369380 commit 6747b5e

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

LibGit2Sharp.Tests/DiffTreeToTreeFixture.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,10 @@ public void UsingPatienceAlgorithmCompareOptionProducesPatienceDiff()
11401140
string repoPath = InitNewRepository();
11411141
using (var repo = new Repository(repoPath))
11421142
{
1143-
Func<string, Tree> fromString = s => repo.ObjectDatabase.CreateTree(new TreeDefinition().Add("file.txt", OdbHelper.CreateBlob(repo, s), Mode.NonExecutableFile));
1143+
Func<string, Tree> fromString =
1144+
s =>
1145+
repo.ObjectDatabase.CreateTree(new TreeDefinition().Add("file.txt",
1146+
OdbHelper.CreateBlob(repo, s), Mode.NonExecutableFile));
11441147

11451148
Tree treeOld = fromString(new StringBuilder()
11461149
.Append("aaaaaa\n")
@@ -1196,7 +1199,8 @@ public void UsingPatienceAlgorithmCompareOptionProducesPatienceDiff()
11961199
.Append("+cccccc\n").ToString();
11971200

11981201
Assert.Equal(diffDefault, repo.Diff.Compare<Patch>(treeOld, treeNew));
1199-
Assert.Equal(diffPatience, repo.Diff.Compare<Patch>(treeOld, treeNew, compareOptions: new CompareOptions { PatienceAlgorithm = true }));
1202+
Assert.Equal(diffPatience, repo.Diff.Compare<Patch>(treeOld, treeNew,
1203+
compareOptions: new CompareOptions { UsePatienceAlgorithm = true }));
12001204
}
12011205
}
12021206
}

LibGit2Sharp/CompareOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ public CompareOptions()
3939
/// <summary>
4040
/// Use the "patience diff" algorithm.
4141
/// </summary>
42-
public bool PatienceAlgorithm { get; set; }
42+
public bool UsePatienceAlgorithm { get; set; }
4343
}
4444
}

LibGit2Sharp/Diff.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]
4949
options.Flags |= GitDiffOptionFlags.GIT_DIFF_INCLUDE_UNMODIFIED;
5050
}
5151

52-
if (compareOptions.PatienceAlgorithm)
52+
if (compareOptions.UsePatienceAlgorithm)
5353
{
5454
options.Flags |= GitDiffOptionFlags.GIT_DIFF_PATIENCE;
5555
}

0 commit comments

Comments
 (0)