Skip to content

move conflicts to reuc when removing index entries #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ethomson wants to merge 1 commit into from
Closed

move conflicts to reuc when removing index entries #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions LibGit2Sharp/Core/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,11 @@ internal static extern int git_index_remove(
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FilePathMarshaler))] FilePath path,
int stage);

[DllImport(libgit2)]
internal static extern int git_index_remove_bypath(
IndexSafeHandle index,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FilePathMarshaler))] FilePath path);

[DllImport(libgit2)]
internal static extern int git_index_write(IndexSafeHandle index);

Expand Down
9 changes: 9 additions & 0 deletions LibGit2Sharp/Core/Proxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,15 @@ public static void git_index_remove(IndexSafeHandle index, FilePath path, int st
}
}

public static void git_index_remove_bypath(IndexSafeHandle index, FilePath path)
{
using (ThreadAffinity())
{
int res = NativeMethods.git_index_remove_bypath(index, path);
Ensure.ZeroResult(res);
}
}

public static void git_index_write(IndexSafeHandle index)
{
using (ThreadAffinity())
Expand Down
2 changes: 1 addition & 1 deletion LibGit2Sharp/Index.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ private void AddToIndex(string relativePath)

private void RemoveFromIndex(string relativePath)
{
Proxy.git_index_remove(handle, relativePath, 0);
Proxy.git_index_remove_bypath(handle, relativePath);
}

private void UpdatePhysicalIndex()
Expand Down