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

refactor(merge)!: move merge related methods into Merge class (#41)

Browse source
This commit is contained in:
Aleksey Kulikov 2022-01-25 18:53:04 +03:00 • committed by GitHub
parent e7c18c35e2
commit 570c696269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 393 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/index_test.dart
View file

@ -327,7 +327,7 @@ void main() {
oid: conflictBranch.target,
);
repo.merge(commit: commit);
Merge.commit(repo: repo, commit: commit);
expect(() => index.writeTree(), throwsA(isA<LibGit2Error>()));
@ -366,7 +366,7 @@ void main() {
conflictRepo.checkout(target: 'refs/heads/feature');
conflictRepo.merge(commit: commit);
Merge.commit(repo: conflictRepo, commit: commit);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['feature_file']!;
@ -395,7 +395,7 @@ void main() {
oid: conflictBranch.target,
);
conflictRepo.merge(commit: commit);
Merge.commit(repo: conflictRepo, commit: commit);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['conflict_file']!;
@ -426,7 +426,7 @@ void main() {
conflictRepo.checkout(target: 'refs/heads/our-conflict');
conflictRepo.merge(commit: commit);
Merge.commit(repo: conflictRepo, commit: commit);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['feature_file']!;
@ -457,7 +457,7 @@ void main() {
conflictRepo.checkout(target: 'refs/heads/feature');
conflictRepo.merge(commit: commit);
Merge.commit(repo: conflictRepo, commit: commit);
final index = conflictRepo.index;
final conflictedFile = index.conflicts['feature_file']!;
@ -487,7 +487,7 @@ void main() {
);
final index = conflictRepo.index;
conflictRepo.merge(commit: commit);
Merge.commit(repo: conflictRepo, commit: commit);
expect(index.hasConflicts, true);
expect(index['.gitignore'].isConflict, false);
expect(index.conflicts['conflict_file']!.our!.isConflict, true);
@ -528,7 +528,7 @@ void main() {
);
final index = conflictRepo.index;
conflictRepo.merge(commit: commit);
Merge.commit(repo: conflictRepo, commit: commit);
expect(index.hasConflicts, true);
expect(index.conflicts.length, 1);