Fixup: tweaks and code review feedback

Author: jamill

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -158,4 +158,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

LibGit2Sharp.Tests/RebaseFixture.cs

@@ -89,7 +89,7 @@ public void CanRebase(string initialBranchName,
 
                 // Verify the chain of commits that resulted from the rebase.
                 Commit expectedParent = expectedOntoCommit;
-                foreach(CompletedRebaseStepInfo stepInfo in PostRebaseResults)
+                foreach (CompletedRebaseStepInfo stepInfo in PostRebaseResults)
                 {
                     Commit rebasedCommit = stepInfo.Commit;
                     Assert.Equal(expectedParent.Id, rebasedCommit.Parents.First().Id);
@@ -113,7 +113,7 @@ public CompletedRebaseStepInfo(Commit commit, bool wasPatchAlreadyApplied)
 
             public bool WasPatchAlreadyApplied { get; set; }
 
-                        public override string ToString()
+            public override string ToString()
             {
                 return string.Format("CompletedRebaseStepInfo: {0}", Commit);
             }
@@ -128,8 +128,8 @@ bool IEqualityComparer<CompletedRebaseStepInfo>.Equals(CompletedRebaseStepInfo x
                     return true;
                 }
 
-                if ((x == null && y != null ) ||
-                    (x != null && y == null ))
+                if ((x == null && y != null) ||
+                    (x != null && y == null))
                 {
                     return false;
                 }

LibGit2Sharp/Core/Proxy.cs

@@ -1654,28 +1654,28 @@ public static RebaseSafeHandle git_rebase_init(
             GitAnnotatedCommitHandle onto,
             ref GitRebaseOptions options)
         {
-            RebaseSafeHandle rebase = null;
-
             using (ThreadAffinity())
             {
+                RebaseSafeHandle rebase = null;
+
                 int result = NativeMethods.git_rebase_init(out rebase, repo, branch, upstream, onto, ref options);
                 Ensure.ZeroResult(result);
-            }
 
-            return rebase;
+                return rebase;
+            }
         }
 
         public static RebaseSafeHandle git_rebase_open(RepositorySafeHandle repo)
         {
-            RebaseSafeHandle rebase = null;
-
             using (ThreadAffinity())
             {
+                RebaseSafeHandle rebase = null;
+
                 int result = NativeMethods.git_rebase_open(out rebase, repo);
                 Ensure.ZeroResult(result);
-            }
 
-            return rebase;
+                return rebase;
+            }
         }
 
         public static long git_rebase_operation_entrycount(RebaseSafeHandle rebase)
@@ -1710,9 +1710,9 @@ public static GitRebaseOperation git_rebase_operation_byindex(
         public static GitRebaseOperation git_rebase_next(RebaseSafeHandle rebase,
             ref GitCheckoutOpts options)
         {
-            GitRebaseOperation operation = null;
             using (ThreadAffinity())
             {
+                GitRebaseOperation operation = null;
                 IntPtr ptr;
                 int result = NativeMethods.git_rebase_next(out ptr, rebase, ref options);
                 if (result == (int)GitErrorCode.IterOver)
@@ -1726,9 +1726,9 @@ public static GitRebaseOperation git_rebase_next(RebaseSafeHandle rebase,
 
                 // Workaround until 92e87dd74 from libgit2 is consumed by LibGit2#
                 operation.exec = IntPtr.Zero;
-            }
 
-            return operation;
+                return operation;
+            }
         }
 
         public static GitRebaseCommitResult git_rebase_commit(
@@ -1739,28 +1739,26 @@ public static GitRebaseCommitResult git_rebase_commit(
             Ensure.ArgumentNotNull(rebase, "rebase");
             Ensure.ArgumentNotNull(committer, "committer");
 
-            GitRebaseCommitResult commitResult = new GitRebaseCommitResult();
-
+            using (ThreadAffinity())
             using (SignatureSafeHandle committerHandle = committer.BuildHandle())
             using (SignatureSafeHandle authorHandle = author.SafeBuildHandle())
             {
-                using (ThreadAffinity())
-                {
-                    int result = NativeMethods.git_rebase_commit(ref commitResult.CommitId, rebase, authorHandle, committerHandle, IntPtr.Zero, IntPtr.Zero);
+                GitRebaseCommitResult commitResult = new GitRebaseCommitResult();
 
-                    if (result == (int)GitErrorCode.Applied)
-                    {
-                        commitResult.CommitId = GitOid.Empty;
-                        commitResult.WasPatchAlreadyApplied = true;
-                    }
-                    else
-                    {
-                        Ensure.ZeroResult(result);
-                    }
+                int result = NativeMethods.git_rebase_commit(ref commitResult.CommitId, rebase, authorHandle, committerHandle, IntPtr.Zero, IntPtr.Zero);
+
+                if (result == (int)GitErrorCode.Applied)
+                {
+                    commitResult.CommitId = GitOid.Empty;
+                    commitResult.WasPatchAlreadyApplied = true;
+                }
+                else
+                {
+                    Ensure.ZeroResult(result);
                 }
-            }
 
-            return commitResult;
+                return commitResult;
+            }
         }
 
         /// <summary>

LibGit2Sharp/Rebase.cs

@@ -139,6 +139,9 @@ public virtual RebaseResult Continue(Signature committer, RebaseOptions options)
 
             using (RebaseSafeHandle rebase = Proxy.git_rebase_open(repository.Handle))
             {
+                // TODO: Should we check the pre-conditions for committing here
+                // for instance - what if we had failed on the git_rebase_finish call,
+                // do we want continue to be able to restart afterwords...
                 var rebaseCommitResult = Proxy.git_rebase_commit(rebase, null, committer);
 
                 // Report that we just completed the step

LibGit2Sharp/RebaseOperationImpl.cs

@@ -150,8 +150,6 @@ public static RebaseResult Run(RebaseSafeHandle rebaseOperationHandle,
                     };
 
                     // Rebase is completed!
-                    // currentStep is the last completed - increment it to account
-                    // for the fact that we have moved past last step index.
                     Proxy.git_rebase_finish(rebaseOperationHandle, committer, gitRebaseOptions);
                     rebaseResult = new RebaseResult(RebaseStatus.Complete,
                                                     totalStepCount,