Skip to content

Commit d40497c

Browse files
committed
Rebase: null out operation.exec field
1 parent b3b77ac commit d40497c

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

LibGit2Sharp/Core/Proxy.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,11 @@ public static GitRebaseOperation git_rebase_operation_byindex(
16311631
{
16321632
Debug.Assert(index >= 0);
16331633
IntPtr ptr = NativeMethods.git_rebase_operation_byindex(rebase, ((UIntPtr) index));
1634-
return ptr.MarshalAs<GitRebaseOperation>();
1634+
GitRebaseOperation operation = ptr.MarshalAs<GitRebaseOperation>();
1635+
1636+
// Workaround until 92e87dd74 from libgit2 is consumed by LibGit2#
1637+
operation.exec = IntPtr.Zero;
1638+
return operation;
16351639
}
16361640

16371641
/// <summary>
@@ -1656,6 +1660,9 @@ public static GitRebaseOperation git_rebase_next(RebaseSafeHandle rebase,
16561660

16571661
// If successsful, then marshal native struct to managed struct.
16581662
operation = ptr.MarshalAs<GitRebaseOperation>();
1663+
1664+
// Workaround until 92e87dd74 from libgit2 is consumed by LibGit2#
1665+
operation.exec = IntPtr.Zero;
16591666
}
16601667

16611668
return operation;

0 commit comments

Comments
 (0)