8000 Fix marshaling of diff functions · mm201/libgit2sharp@91a1121 · GitHub
[go: up one dir, main page]

Skip to content

Commit 91a1121

Browse files
committed
Fix marshaling of diff functions
1 parent 6d1711a commit 91a1121

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

LibGit2Sharp/Core/NativeMethods.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line number 8000 Diff line change
@@ -228,24 +228,26 @@ public static extern int git_diff_tree_to_tree(
228228
public static extern int git_diff_index_to_tree(
229229
RepositorySafeHandle repo,
230230
GitDiffOptions options,
231-
IntPtr oldTree,
232-
out IntPtr diff);
231+
GitObjectSafeHandle oldTree,
232+
out DiffListSafeHandle diff);
233+
234+
[DllImport(libgit2)]
235+
public static extern int git_diff_merge(
236+
DiffListSafeHandle onto,
237+
DiffListSafeHandle from);
233238

234239
[DllImport(libgit2)]
235240
public static extern int git_diff_workdir_to_index(
236241
RepositorySafeHandle repo,
237242
GitDiffOptions options,
238-
out IntPtr diff);
243+
out DiffListSafeHandle diff);
239244

240245
[DllImport(libgit2)]
241246
public static extern int git_diff_workdir_to_tree(
242247
RepositorySafeHandle repo,
243248
GitDiffOptions options,
244-
IntPtr oldTree,
245-
out IntPtr diff);
246-
247-
[DllImport(libgit2)]
248-
public static extern int git_diff_merge(IntPtr onto, IntPtr from);
249+
GitObjectSafeHandle oldTree,
250+
out DiffListSafeHandle diff);
249251

250252
internal delegate int git_diff_file_fn(
251253
IntPtr data,

0 commit comments

Comments
 (0)
0