8000 Fix misspelled enum · devinvisible/libgit2sharp@bd06dac · GitHub
[go: up one dir, main page]
Skip to content

Commit bd06dac

Browse files
jamilljamill
committed
Fix misspelled enum
1 parent aa70916 commit bd06dac

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

‎LibGit2Sharp.Tests/MergeFixture.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,9 @@ public void CanFastForwardCommit(bool fromDetachedHead, FastForwardStrategy fast
324324

325325
[Theory]
326326
[InlineData(true, FastForwardStrategy.Default, MergeStatus.NonFastForward)]
327-
[InlineData(true, FastForwardStrategy.NoFastFoward, MergeStatus.NonFastForward)]
327+
[InlineData(true, FastForwardStrategy.NoFastForward, MergeStatus.NonFastForward)]
328328
[InlineData(false, FastForwardStrategy.Default, MergeStatus.NonFastForward)]
329-
[InlineData(false, FastForwardStrategy.NoFastFoward, MergeStatus.NonFastForward)]
329+
[InlineData(false, FastForwardStrategy.NoFastForward, MergeStatus.NonFastForward)]
330330
public void CanNonFastForwardMergeCommit(bool fromDetachedHead, FastForwardStrategy fastForwardStrategy, MergeStatus expectedMergeStatus)
331331
{
332332
string path = SandboxMergeTestRepo();
@@ -516,7 +516,7 @@ public void CanForceNonFastForwardMerge()
516516
{
517517
Commit commitToMerge = repo.Branches["fast_forward"].Tip;
518518

519-
MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastFoward });
519+
MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastForward });
520520

521521
Assert.Equal(MergeStatus.NonFastForward, result.Status);
522522
Assert.Equal("f58f780d5a0ae392efd4a924450b1bbdc0577d32", result.Commit.Id.Sha);
@@ -550,7 +550,7 @@ public void VerifyUpToDateMerge()
550550
{
551551
Commit commitToMerge = repo.Branches["master"].Tip;
552552

553-
MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastFoward });
553+
MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastForward });
554554

555555
Assert.Equal(MergeStatus.UpToDate, result.Status);
556556
Assert.Equal(null, result.Commit);
@@ -578,8 +578,8 @@ public void CanMergeCommittish(string committish, FastForwardStrategy strategy,
578578
[Theory]
579579
[InlineData(true, FastForwardStrategy.FastForwardOnly)]
580580
[InlineData(false, FastForwardStrategy.FastForwardOnly)]
581-
[InlineData(true, FastForwardStrategy.NoFastFoward)]
582-
[InlineData(false, FastForwardStrategy.NoFastFoward)]
581+
[InlineData(true, FastForwardStrategy.NoFastForward)]
582+
[InlineData(false, FastForwardStrategy.NoFastForward)]
583583
public void MergeWithWorkDirConflictsThrows(bool shouldStage, FastForwardStrategy strategy)
584584
{
585585
// Merging the fast_forward branch results in a change to file

‎LibGit2Sharp.Tests/NetworkFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void CanListRemoteReferencesWithCredentials()
132132

133133
[Theory]
134134
[InlineData(FastForwardStrategy.Default)]
135-
[InlineData(FastForwardStrategy.NoFastFoward)]
135+
[InlineData(FastForwardStrategy.NoFastForward)]
136136
public void CanPull(FastForwardStrategy fastForwardStrategy)
137137
{
138138
string url = "https://github.com/libgit2/TestGitRepository";

‎LibGit2Sharp/MergeOptions.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using LibGit2Sharp.Core;
22
using LibGit2Sharp.Handlers;
3+
using System;
34

45
namespace LibGit2Sharp
56
{
@@ -118,8 +119,14 @@ public enum FastForwardStrategy
118119
/// <summary>
119120
/// Do not fast-forward. Always creates a merge commit.
120121
/// </summary>
122+
[Obsolete("This enum member will be removed in the next release. Please use NoFastForward instead.")]
121123
NoFastFoward = 1, /* GIT_MERGE_NO_FASTFORWARD */
122124

125+
/// <summary>
126+
/// Do not fast-forward. Always creates a merge commit.
127+
/// </summary>
128+
NoFastForward = 1, /* GIT_MERGE_NO_FASTFORWARD */
129+
123130
/// <summary>
124131
/// Only perform fast-forward merges.
125132
/// </summary>

‎LibGit2Sharp/Repository.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ private FastForwardStrategy FastForwardStrategyFromMergePreference(GitMergePrefe
12421242
case GitMergePreference.GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY:
12431243
return FastForwardStrategy.FastForwardOnly;
12441244
case GitMergePreference.GIT_MERGE_PREFERENCE_NO_FASTFORWARD:
1245-
return FastForwardStrategy.NoFastFoward;
1245+
return FastForwardStrategy.NoFastForward;
12461246
default:
12471247
throw new InvalidOperationException(String.Format("Unknown merge preference: {0}", preference));
12481248
}
@@ -1308,7 +1308,7 @@ private MergeResult Merge(GitAnnotatedCommitHandle[] annotatedCommits, Signature
13081308
throw new NonFastForwardException("Cannot perform fast-forward merge.");
13091309
}
13101310
break;
1311-
case FastForwardStrategy.NoFastFoward:
1311+
case FastForwardStrategy.NoFastForward:
13121312
if (mergeAnalysis.HasFlag(GitMergeAnalysis.GIT_MERGE_ANALYSIS_NORMAL))
13131313
{
13141314
mergeResult = NormalMerge(annotatedCommits, merger, options);

0 commit comments

Comments
 (0)
0