mirror of
https://github.com/SkinnyMind/libgit2dart.git
synced 2025-05-04 20:29:08 -04:00
refactor(commit)!: return Tree object instead of Oid for tree getter
This commit is contained in:
parent
458c0bdc71
commit
050c0eb57a
5 changed files with 20 additions and 15 deletions
|
@ -183,9 +183,9 @@ void main() {
|
|||
final baseCommit =
|
||||
repo[repo.mergeBase(ourCommit.id.sha, theirCommit.id.sha).sha]
|
||||
as Commit;
|
||||
final theirTree = repo[theirCommit.tree.sha] as Tree;
|
||||
final ourTree = repo[ourCommit.tree.sha] as Tree;
|
||||
final ancestorTree = repo[baseCommit.tree.sha] as Tree;
|
||||
final theirTree = theirCommit.tree;
|
||||
final ourTree = ourCommit.tree;
|
||||
final ancestorTree = baseCommit.tree;
|
||||
|
||||
final mergeIndex = repo.mergeTrees(
|
||||
ancestorTree: ancestorTree,
|
||||
|
@ -221,9 +221,9 @@ void main() {
|
|||
final baseCommit =
|
||||
repo[repo.mergeBase(ourCommit.id.sha, theirCommit.id.sha).sha]
|
||||
as Commit;
|
||||
final theirTree = repo[theirCommit.tree.sha] as Tree;
|
||||
final ourTree = repo[ourCommit.tree.sha] as Tree;
|
||||
final ancestorTree = repo[baseCommit.tree.sha] as Tree;
|
||||
final theirTree = theirCommit.tree;
|
||||
final ourTree = ourCommit.tree;
|
||||
final ancestorTree = baseCommit.tree;
|
||||
|
||||
final mergeIndex = repo.mergeTrees(
|
||||
ancestorTree: ancestorTree,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue