Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
Fixup! Coding style.
  • Loading branch information
Therzok committed Apr 6, 2015
commit 0176b960f49dc5a5f957ec92b0e97fa07601aa3b
4 changes: 3 additions & 1 deletion LibGit2Sharp/Core/Proxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2723,16 +2723,18 @@ public static void git_stash_drop(RepositorySafeHandle repo, int index)
}
}

static StashApplyStatus get_stash_status(int res)
private static StashApplyStatus get_stash_status(int res)
{
if (res == (int)GitErrorCode.MergeConflict)
{
return StashApplyStatus.Conflicts;
}

if (res == (int)GitErrorCode.Exists)
{
return StashApplyStatus.UntrackedExist;
}

Ensure.ZeroResult(res);
return StashApplyStatus.Applied;
}
Expand Down