diff --git a/GitTfs/Core/GitTfsRemote.cs b/GitTfs/Core/GitTfsRemote.cs index 917438de..a0a59b1f 100644 --- a/GitTfs/Core/GitTfsRemote.cs +++ b/GitTfs/Core/GitTfsRemote.cs @@ -593,7 +593,7 @@ namespace Sep.Git.Tfs.Core private string[] BuildCommitCommand(LogEntry logEntry) { - var commitCommand = new List { "commit-tree", logEntry.Tree }; + var commitCommand = new List { "commit-tree", logEntry.Tree.Sha }; foreach (var parent in logEntry.CommitParents) { commitCommand.Add("-p"); diff --git a/GitTfs/Core/GitTreeBuilder.cs b/GitTfs/Core/GitTreeBuilder.cs index ede9ad37..2d73bb27 100644 --- a/GitTfs/Core/GitTreeBuilder.cs +++ b/GitTfs/Core/GitTreeBuilder.cs @@ -34,9 +34,9 @@ namespace Sep.Git.Tfs.Core _treeDefinition.Remove(path); } - public string GetTree() + public Tree GetTree() { - return _objectDatabase.CreateTree(_treeDefinition).Sha; + return _objectDatabase.CreateTree(_treeDefinition); } } } diff --git a/GitTfs/Core/IGitTreeBuilder.cs b/GitTfs/Core/IGitTreeBuilder.cs index 5a9a42b7..03760af0 100644 --- a/GitTfs/Core/IGitTreeBuilder.cs +++ b/GitTfs/Core/IGitTreeBuilder.cs @@ -1,4 +1,6 @@ -namespace Sep.Git.Tfs.Core +using LibGit2Sharp; + +namespace Sep.Git.Tfs.Core { public interface IGitTreeModifier { @@ -8,6 +10,6 @@ public interface IGitTreeBuilder : IGitTreeModifier { - string GetTree(); + Tree GetTree(); } } diff --git a/GitTfs/Core/LogEntry.cs b/GitTfs/Core/LogEntry.cs index 562877f1..46f7d97a 100644 --- a/GitTfs/Core/LogEntry.cs +++ b/GitTfs/Core/LogEntry.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using LibGit2Sharp; namespace Sep.Git.Tfs.Core { @@ -11,7 +12,7 @@ namespace Sep.Git.Tfs.Core } public string AuthorName { get; set; } - public string Tree { get; set; } + public Tree Tree { get; set; } public IList CommitParents { get; private set; }