Fix misspelled enum

Author: jamill

LibGit2Sharp.Tests/MergeFixture.cs

@@ -324,9 +324,9 @@ public void CanFastForwardCommit(bool fromDetachedHead, FastForwardStrategy fast
 
         [Theory]
         [InlineData(true, FastForwardStrategy.Default, MergeStatus.NonFastForward)]
-        [InlineData(true, FastForwardStrategy.NoFastFoward, MergeStatus.NonFastForward)]
+        [InlineData(true, FastForwardStrategy.NoFastForward, MergeStatus.NonFastForward)]
         [InlineData(false, FastForwardStrategy.Default, MergeStatus.NonFastForward)]
-        [InlineData(false, FastForwardStrategy.NoFastFoward, MergeStatus.NonFastForward)]
+        [InlineData(false, FastForwardStrategy.NoFastForward, MergeStatus.NonFastForward)]
         public void CanNonFastForwardMergeCommit(bool fromDetachedHead, FastForwardStrategy fastForwardStrategy, MergeStatus expectedMergeStatus)
         {
             string path = SandboxMergeTestRepo();
@@ -516,7 +516,7 @@ public void CanForceNonFastForwardMerge()
             {
                 Commit commitToMerge = repo.Branches["fast_forward"].Tip;
 
-                MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastFoward });
+                MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastForward });
 
                 Assert.Equal(MergeStatus.NonFastForward, result.Status);
                 Assert.Equal("f58f780d5a0ae392efd4a924450b1bbdc0577d32", result.Commit.Id.Sha);
@@ -550,7 +550,7 @@ public void VerifyUpToDateMerge()
             {
                 Commit commitToMerge = repo.Branches["master"].Tip;
 
-                MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastFoward });
+                MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastForward });
 
                 Assert.Equal(MergeStatus.UpToDate, result.Status);
                 Assert.Equal(null, result.Commit);
@@ -578,8 +578,8 @@ public void CanMergeCommittish(string committish, FastForwardStrategy strategy,
         [Theory]
         [InlineData(true, FastForwardStrategy.FastForwardOnly)]
         [InlineData(false, FastForwardStrategy.FastForwardOnly)]
-        [InlineData(true, FastForwardStrategy.NoFastFoward)]
-        [InlineData(false, FastForwardStrategy.NoFastFoward)]
+        [InlineData(true, FastForwardStrategy.NoFastForward)]
+        [InlineData(false, FastForwardStrategy.NoFastForward)]
         public void MergeWithWorkDirConflictsThrows(bool shouldStage, FastForwardStrategy strategy)
         {
             // Merging the fast_forward branch results in a change to file

LibGit2Sharp.Tests/NetworkFixture.cs

@@ -132,7 +132,7 @@ public void CanListRemoteReferencesWithCredentials()
 
         [Theory]
         [InlineData(FastForwardStrategy.Default)]
-        [InlineData(FastForwardStrategy.NoFastFoward)]
+        [InlineData(FastForwardStrategy.NoFastForward)]
         public void CanPull(FastForwardStrategy fastForwardStrategy)
         {
             string url = "https://github.com/libgit2/TestGitRepository";

LibGit2Sharp/MergeOptions.cs

@@ -1,5 +1,6 @@
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Handlers;
+using System;
 
 namespace LibGit2Sharp
 {
@@ -118,8 +119,14 @@ public enum FastForwardStrategy
         /// <summary>
         /// Do not fast-forward. Always creates a merge commit.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use NoFastForward instead.")]
         NoFastFoward = 1, /* GIT_MERGE_NO_FASTFORWARD */
 
+        /// <summary>
+        /// Do not fast-forward. Always creates a merge commit.
+        /// </summary>
+        NoFastForward = 1, /* GIT_MERGE_NO_FASTFORWARD */
+
         /// <summary>
         /// Only perform fast-forward merges.
         /// </summary>

LibGit2Sharp/Repository.cs

@@ -1242,7 +1242,7 @@ private FastForwardStrategy FastForwardStrategyFromMergePreference(GitMergePrefe
                 case GitMergePreference.GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY:
                     return FastForwardStrategy.FastForwardOnly;
                 case GitMergePreference.GIT_MERGE_PREFERENCE_NO_FASTFORWARD:
-                    return FastForwardStrategy.NoFastFoward;
+                    return FastForwardStrategy.NoFastForward;
                 default:
                     throw new InvalidOperationException(String.Format("Unknown merge preference: {0}", preference));
             }
@@ -1308,7 +1308,7 @@ private MergeResult Merge(GitAnnotatedCommitHandle[] annotatedCommits, Signature
                         throw new NonFastForwardException("Cannot perform fast-forward merge.");
                     }
                     break;
-                case FastForwardStrategy.NoFastFoward:
+                case FastForwardStrategy.NoFastForward:
                     if (mergeAnalysis.HasFlag(GitMergeAnalysis.GIT_MERGE_ANALYSIS_NORMAL))
                     {
                         mergeResult = NormalMerge(annotatedCommits, merger, options);