Bump libgit2sharp

5 files changed, 11 insertions, 9 deletions

diff --git a/.gitmodules b/.gitmodules
index 3082c40c6e..44fbace703 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,12 +43,12 @@
 	url = git://github.com/mono/sharpsvn-binary.git
 [submodule "main/external/libgit2sharp"]
 	path = main/external/libgit2sharp
-	url = git://github.com/libgit2/libgit2sharp.git
-	branch = xs-5.10-v1
+	url = git://github.com/mono/libgit2sharp.git
+	branch = xs-5.10-v2
 [submodule "main/external/libgit-binary"]
 	path = main/external/libgit-binary
 	url = git://github.com/mono/libgit-binary.git
 [submodule "main/external/libgit2"]
 	path = main/external/libgit2
 	url = git://github.com/mono/libgit2.git
-	branch = xs-5.10-v1
+	branch = xs-5.10-v2
diff --git a/main/external/libgit-binary b/main/external/libgit-binary
-Subproject ba9f025efbcf2ed4afeccf8ae48f1d5b07b8ca3
+Subproject 8f14307f5be64ca0a3784478143e863f7bfa3b8
diff --git a/main/external/libgit2 b/main/external/libgit2
-Subproject 3d5286e151cecad8092060cdca0335031f9cda7
+Subproject e8b8948f5a07cd813ccad7b97490b7f040d364c
diff --git a/main/external/libgit2sharp b/main/external/libgit2sharp
-Subproject 2733f93dcd7376f3c83ed7e9cd97a324386be76
+Subproject 06bbc96251eea534ed66a32e8f2e2edaaa90307
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
index 489a9f2d44..9e33506ea9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
@@ -700,8 +700,10 @@ namespace MonoDevelop.VersionControl.Git
 					break;
 				}
 			}
-			if (!string.IsNullOrEmpty (message))
-				RootRepository.Commit (message);
+			if (!string.IsNullOrEmpty (message)) {
+				var sig = GetSignature ();
+				RootRepository.Commit (message, sig, sig);
+			}
 			return true;
 		}
 
@@ -739,8 +741,8 @@ namespace MonoDevelop.VersionControl.Git
 				// Do a rebase.
 				var divergence = RootRepository.ObjectDatabase.CalculateHistoryDivergence (RootRepository.Head.Tip, RootRepository.Branches [branch].Tip);
 				var toApply = RootRepository.Commits.QueryBy (new CommitFilter {
-					Since = RootRepository.Head.Tip,
-					Until = divergence.CommonAncestor,
+					IncludeReachableFrom = RootRepository.Head.Tip,
+					ExcludeReachableFrom = divergence.CommonAncestor,
 					SortBy = CommitSortStrategies.Topological
 				});
 
@@ -837,7 +839,7 @@ namespace MonoDevelop.VersionControl.Git
 					(string)changeSet.ExtendedProperties ["Git.AuthorEmail"],
 					DateTimeOffset.Now), sig);
 			else
-				repo.RootRepository.Commit (message, sig);
+				repo.RootRepository.Commit (message, sig, sig);
 		}
 
 		public bool IsUserInfoDefault ()
@@ -1436,7 +1438,7 @@ namespace MonoDevelop.VersionControl.Git
 			repositoryPath = repository.ToGitPath (repositoryPath);
 			var status = repository.RetrieveStatus (repositoryPath);
 			if (status != FileStatus.NewInIndex && status != FileStatus.NewInWorkdir) {
-				foreach (var hunk in repository.Blame (repositoryPath, new BlameOptions { Strategy = BlameStrategy.FollowExactRenames })) {
+				foreach (var hunk in repository.Blame (repositoryPath, new BlameOptions { FindExactRenames = true, })) {
 					var commit = hunk.FinalCommit;
 					var author = hunk.FinalSignature;
 					working = new Annotation (commit.Sha, author.Name, author.When.LocalDateTime, String.Format ("<{0}>", author.Email));