diff options
author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-08-25 19:26:30 +0300 |
---|---|---|
committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-08-25 21:35:46 +0300 |
commit | ad945d30806995c1fe92ac1e94cbc26bfe0ac2c3 (patch) | |
tree | 5ec9eede455a6254591972ebe4ea8e06cf61948b /main/src/addins/VersionControl | |
parent | 64a82eb1406cca5028982ae1661c31f45c00f1e6 (diff) |
Bump libgit2sharp
Diffstat (limited to 'main/src/addins/VersionControl')
-rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs | 14 |
1 files changed, 8 insertions, 6 deletions
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)); |