Siklos/libgit2dart
1
0
Fork 0
mirror of https://github.com/SkinnyMind/libgit2dart.git synced 2025-05-04 20:29:08 -04:00
Code Issues Projects Releases Wiki Activity

feat(merge)!: add more bindings and API methods (#24)

Browse source
This commit is contained in:
Aleksey Kulikov 2021-12-21 17:11:41 +03:00 • committed by GitHub
parent 561986ebfd
commit 9791b6324c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 394 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/index_test.dart
View file

@ -311,7 +311,7 @@ void main() {
final conflictBranch = repo.lookupBranch(name: 'conflict-branch');
final index = repo.index;
repo.merge(conflictBranch.target);
repo.merge(oid: conflictBranch.target);
expect(() => index.writeTree(), throwsA(isA<LibGit2Error>()));
@ -344,7 +344,7 @@ void main() {
conflictRepo.checkout(refName: 'refs/heads/feature');
conflictRepo.merge(conflictBranch.target);
conflictRepo.merge(oid: conflictBranch.target);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['feature_file']!;
@ -365,7 +365,7 @@ void main() {
final conflictBranch = conflictRepo.lookupBranch(name: 'conflict-branch');
conflictRepo.merge(conflictBranch.target);
conflictRepo.merge(oid: conflictBranch.target);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['conflict_file']!;
@ -390,7 +390,7 @@ void main() {
conflictRepo.checkout(refName: 'refs/heads/our-conflict');
conflictRepo.merge(conflictBranch.target);
conflictRepo.merge(oid: conflictBranch.target);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['feature_file']!;
@ -413,7 +413,7 @@ void main() {
conflictRepo.checkout(refName: 'refs/heads/feature');
conflictRepo.merge(conflictBranch.target);
conflictRepo.merge(oid: conflictBranch.target);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['feature_file']!;
@ -435,7 +435,7 @@ void main() {
final conflictBranch = conflictRepo.lookupBranch(name: 'conflict-branch');
final index = conflictRepo.index;
conflictRepo.merge(conflictBranch.target);
conflictRepo.merge(oid: conflictBranch.target);
expect(index.hasConflicts, true);
expect(index['.gitignore'].isConflict, false);
expect(index.conflicts['conflict_file']!.our!.isConflict, true);
@ -468,7 +468,7 @@ void main() {
final conflictBranch = conflictRepo.lookupBranch(name: 'conflict-branch');
final index = conflictRepo.index;
conflictRepo.merge(conflictBranch.target);
conflictRepo.merge(oid: conflictBranch.target);
expect(index.hasConflicts, true);
expect(index.conflicts.length, 1);