Merge pull request libgit2#1919 from OronDF343/patch-1

bording · web-flow · commit 1e6da83ab8c4 · 2022-01-03T19:27:08.000-05:00
Fix incorrect information in exceptions
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -1500,13 +1500,13 @@ private MergeResult Merge(AnnotatedCommitHandle[] annotatedCommits, Signature me
                     break;
                 default:
                     throw new NotImplementedException(
-                        string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", mergeAnalysis));
+                        string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", fastForwardStrategy));
             }
 
             if (mergeResult == null)
             {
                 throw new NotImplementedException(
-                    string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", options.FastForwardStrategy));
+                    string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", mergeAnalysis));
             }
 
             return mergeResult;

Original file line number	Diff line number	Diff line change
`@@ -1500,13 +1500,13 @@ private MergeResult Merge(AnnotatedCommitHandle[] annotatedCommits, Signature me`
`1500`	`1500`	`break;`
`1501`	`1501`	`default:`
`1502`	`1502`	`throw new NotImplementedException(`
`1503`		`- string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", mergeAnalysis));`
	`1503`	`+ string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", fastForwardStrategy));`
`1504`	`1504`	`}`
`1505`	`1505`
`1506`	`1506`	`if (mergeResult == null)`
`1507`	`1507`	`{`
`1508`	`1508`	`throw new NotImplementedException(`
`1509`		`- string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", options.FastForwardStrategy));`
	`1509`	`+ string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", mergeAnalysis));`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`	`1512`	`return mergeResult;`