fixups

jamill · jamill · commit 153a16b387b1 · 2015-03-09T13:47:42.000-04:00
diff --git a/LibGit2Sharp.Tests/RebaseFixture.cs b/LibGit2Sharp.Tests/RebaseFixture.cs
@@ -187,7 +187,7 @@ public void CanAbortRebase()
                 Assert.Equal(0, rebaseResult.CompletedStepCount);
                 Assert.Equal(3, rebaseResult.TotalStepCount);
 
-                repo.CurrentRebaseOperation.Abort();
+                repo.CurrentRebaseOperation.Abort(Constants.Signature);
                 Assert.False(repo.RetrieveStatus().IsDirty);
                 Assert.True(repo.Index.IsFullyMerged);
                 Assert.Equal(CurrentOperation.None, repo.Info.CurrentOperation);
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -264,12 +264,12 @@ internal static extern int git_rebase_commit(
         [DllImport(libgit2)]
         internal static extern int git_rebase_abort(
             RebaseSafeHandle rebase,
-            GitSignature signature);
+            SignatureSafeHandle signature);
 
         [DllImport(libgit2)]
         internal static extern int git_rebase_finish(
             RebaseSafeHandle repo,
-            GitSignature signature,
+            SignatureSafeHandle signature,
             ref GitRebaseOptions options);
 
         [DllImport(libgit2)]
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -1704,22 +1704,28 @@ public static GitOid git_rebase_commit(
 
         public static void git_rebase_abort(
             RebaseSafeHandle rebase,
-            GitSignature signature)
+            Signature signature)
         {
+            Ensure.ArgumentNotNull(signature, "signature");
+
             using (ThreadAffinity())
+            using (var signatureHandle = signature.BuildHandle())
             {
-                int result = NativeMethods.git_rebase_abort(rebase, signature);
+                int result = NativeMethods.git_rebase_abort(rebase, signatureHandle);
             }
         }
 
         public static void git_rebase_finish(
             RebaseSafeHandle repo,
-            GitSignature signature,
+            Signature signature,
             GitRebaseOptions options)
         {
+            Ensure.ArgumentNotNull(signature, "signature");
+
             using (ThreadAffinity())
+            using (var signatureHandle = signature.BuildHandle())
             {
-                int result = NativeMethods.git_rebase_finish(repo, signature, ref options);
+                int result = NativeMethods.git_rebase_finish(repo, signatureHandle, ref options);
                 Ensure.ZeroResult(result);
             }
         }
diff --git a/LibGit2Sharp/RebaseOperation.cs b/LibGit2Sharp/RebaseOperation.cs
@@ -67,6 +67,8 @@ internal RebaseOperation(Repository repo)
         /// <summary>
         /// Continue the current rebase.
         /// </summary>
+        /// <param name="committer">The <see cref="Signature"/> of who added the change to the repository.</param>
+        /// <param name="options">The <see cref="RebaseOptions"/> that specify the commit behavior.</param>
         public virtual RebaseResult Continue(Signature committer, RebaseOptions options)
         {
             Ensure.ArgumentNotNull(committer, "committer");
@@ -109,13 +111,16 @@ public virtual RebaseResult Continue(Signature committer, RebaseOptions options)
         /// <summary>
         /// Abort the rebase operation.
         /// </summary>
-        public virtual void Abort()
+        /// <param name="signature">The <see cref="Signature"/> of who is reborting the rebase.</param>
+        public virtual void Abort(Signature signature)
         {
+            Ensure.ArgumentNotNull(signature, "signature");
+
             RebaseSafeHandle rebase = null;
             try
             {
                 rebase = Proxy.git_rebase_open(repository.Handle);
-                Proxy.git_rebase_abort(rebase, null);
+                Proxy.git_rebase_abort(rebase, signature);
             }
             finally
             {
diff --git a/LibGit2Sharp/RebaseOperationImpl.cs b/LibGit2Sharp/RebaseOperationImpl.cs
@@ -53,7 +53,7 @@ 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, null, gitRebaseOptions);
+                        Proxy.git_rebase_finish(rebaseOperationHandle, committer, gitRebaseOptions);
                         rebaseResult = new RebaseResult(RebaseStatus.Complete,
                                                         currentStepIndex + 1,
                                                         totalStepCount,

Original file line number	Diff line number	Diff line change
`@@ -1704,22 +1704,28 @@ public static GitOid git_rebase_commit(`
`1704`	`1704`
`1705`	`1705`	`public static void git_rebase_abort(`
`1706`	`1706`	`RebaseSafeHandle rebase,`
`1707`		`- GitSignature signature)`
	`1707`	`+ Signature signature)`
`1708`	`1708`	`{`
	`1709`	`+ Ensure.ArgumentNotNull(signature, "signature");`
	`1710`	`+`
`1709`	`1711`	`using (ThreadAffinity())`
	`1712`	`+ using (var signatureHandle = signature.BuildHandle())`
`1710`	`1713`	`{`
`1711`		`- int result = NativeMethods.git_rebase_abort(rebase, signature);`
	`1714`	`+ int result = NativeMethods.git_rebase_abort(rebase, signatureHandle);`
`1712`	`1715`	`}`
`1713`	`1716`	`}`
`1714`	`1717`
`1715`	`1718`	`public static void git_rebase_finish(`
`1716`	`1719`	`RebaseSafeHandle repo,`
`1717`		`- GitSignature signature,`
	`1720`	`+ Signature signature,`
`1718`	`1721`	`GitRebaseOptions options)`
`1719`	`1722`	`{`
	`1723`	`+ Ensure.ArgumentNotNull(signature, "signature");`
	`1724`	`+`
`1720`	`1725`	`using (ThreadAffinity())`
	`1726`	`+ using (var signatureHandle = signature.BuildHandle())`
`1721`	`1727`	`{`
`1722`		`- int result = NativeMethods.git_rebase_finish(repo, signature, ref options);`
	`1728`	`+ int result = NativeMethods.git_rebase_finish(repo, signatureHandle, ref options);`
`1723`	`1729`	`Ensure.ZeroResult(result);`
`1724`	`1730`	`}`
`1725`	`1731`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ internal RebaseOperation(Repository repo)`
`67`	`67`	`/// <summary>`
`68`	`68`	`/// Continue the current rebase.`
`69`	`69`	`/// </summary>`
	`70`	`+ /// <param name="committer">The <see cref="Signature"/> of who added the change to the repository.</param>`
	`71`	`+ /// <param name="options">The <see cref="RebaseOptions"/> that specify the commit behavior.</param>`
`70`	`72`	`public virtual RebaseResult Continue(Signature committer, RebaseOptions options)`
`71`	`73`	`{`
`72`	`74`	`Ensure.ArgumentNotNull(committer, "committer");`
`@@ -109,13 +111,16 @@ public virtual RebaseResult Continue(Signature committer, RebaseOptions options)`
`109`	`111`	`/// <summary>`
`110`	`112`	`/// Abort the rebase operation.`
`111`	`113`	`/// </summary>`
`112`		`- public virtual void Abort()`
	`114`	`+ /// <param name="signature">The <see cref="Signature"/> of who is reborting the rebase.</param>`
	`115`	`+ public virtual void Abort(Signature signature)`
`113`	`116`	`{`
	`117`	`+ Ensure.ArgumentNotNull(signature, "signature");`
	`118`	`+`
`114`	`119`	`RebaseSafeHandle rebase = null;`
`115`	`120`	`try`
`116`	`121`	`{`
`117`	`122`	`rebase = Proxy.git_rebase_open(repository.Handle);`
`118`		`- Proxy.git_rebase_abort(rebase, null);`
	`123`	`+ Proxy.git_rebase_abort(rebase, signature);`
`119`	`124`	`}`
`120`	`125`	`finally`
`121`	`126`	`{`