Rebase: null out operation.exec field

jamill · jamill · commit b042a0efe7b1 · 2015-03-09T13:47:11.000-04:00
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -1628,7 +1628,11 @@ public static GitRebaseOperation git_rebase_operation_byindex(
         {
             Debug.Assert(index >= 0);
             IntPtr ptr = NativeMethods.git_rebase_operation_byindex(rebase, ((UIntPtr) index));
-            return ptr.MarshalAs<GitRebaseOperation>();
+            GitRebaseOperation operation = ptr.MarshalAs<GitRebaseOperation>();
+
+            // Workaround until 92e87dd74 from libgit2 is consumed by LibGit2#
+            operation.exec = IntPtr.Zero;
+            return operation;
         }
 
         /// <summary>
@@ -1653,6 +1657,9 @@ public static GitRebaseOperation git_rebase_next(RebaseSafeHandle rebase,
 
                 // If successsful, then marshal native struct to managed struct.
                 operation = ptr.MarshalAs<GitRebaseOperation>();
+
+                // Workaround until 92e87dd74 from libgit2 is consumed by LibGit2#
+                operation.exec = IntPtr.Zero;
             }
 
             return operation;

Original file line number	Diff line number	Diff line change
`@@ -1628,7 +1628,11 @@ public static GitRebaseOperation git_rebase_operation_byindex(`
`1628`	`1628`	`{`
`1629`	`1629`	`Debug.Assert(index >= 0);`
`1630`	`1630`	`IntPtr ptr = NativeMethods.git_rebase_operation_byindex(rebase, ((UIntPtr) index));`
`1631`		`- return ptr.MarshalAs<GitRebaseOperation>();`
	`1631`	`+ GitRebaseOperation operation = ptr.MarshalAs<GitRebaseOperation>();`
	`1632`	`+`
	`1633`	`+ // Workaround until 92e87dd74 from libgit2 is consumed by LibGit2#`
	`1634`	`+ operation.exec = IntPtr.Zero;`
	`1635`	`+ return operation;`
`1632`	`1636`	`}`
`1633`	`1637`
`1634`	`1638`	`/// <summary>`
`@@ -1653,6 +1657,9 @@ public static GitRebaseOperation git_rebase_next(RebaseSafeHandle rebase,`
`1653`	`1657`
`1654`	`1658`	`// If successsful, then marshal native struct to managed struct.`
`1655`	`1659`	`operation = ptr.MarshalAs<GitRebaseOperation>();`
	`1660`	`+`
	`1661`	`+ // Workaround until 92e87dd74 from libgit2 is consumed by LibGit2#`
	`1662`	`+ operation.exec = IntPtr.Zero;`
`1656`	`1663`	`}`
`1657`	`1664`
`1658`	`1665`	`return operation;`