8000 Update to libgit2 6aa06b6 by carlosmn · Pull Request #1237 · libgit2/libgit2sharp · GitHub
[go: up one dir, main page]
Skip to content

Update to libgit2 6aa06b6 #1237

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

Merged
merged 4 commits into from
Feb 22, 2016
Merged

Update to libgit2 6aa06b6 #1237

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
575df91
Update to libgit2 a27f31d8
carlosmn Dec 10, 2015
6d14e31
Don't throw on merge conflict
carlosmn Dec 11, 2015
092339c
Make user of early-stop in CanMergeWithoutConflict
carlosmn Dec 14, 2015
4c605af
Update libgit2 to 6aa06b6
carlosmn Dec 14, 2015
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
Next Next commit
Make user of early-stop in CanMergeWithoutConflict 
This stops at the first error so we can return negatives quicker.
  • Loading branch information
@carlosmn
carlosmn committed Dec 14, 2015
commit 092339cfb05d78065c9a22a4ab53596e14e81478
8 changes: 7 additions & 1 deletion LibGit2Sharp/ObjectDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,13 @@ public virtual bool CanMergeWithoutConflict(Commit one, Commit another)
Ensure.ArgumentNotNull(one, "one");
Ensure.ArgumentNotNull(another, "another");

var result = repo.ObjectDatabase.MergeCommits(one, another, null);
var opts = new MergeTreeOptions()
{
SkipReuc = true,
FailOnConflict = true,
};

var result = repo.ObjectDatabase.MergeCommits(one, another, opts);
return (result.Status == MergeTreeStatus.Succeeded);
}

Expand Down
0