refactor(checkout)!: move checkout related methods into Checkout class (#42)

This commit is contained in:
Aleksey Kulikov 2022-01-25 20:16:46 +03:00 committed by GitHub
parent 570c696269
commit 9918ab0905
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 238 additions and 135 deletions

View file

@ -364,7 +364,8 @@ void main() {
oid: conflictBranch.target,
);
conflictRepo.checkout(target: 'refs/heads/feature');
Checkout.reference(repo: conflictRepo, name: 'refs/heads/feature');
conflictRepo.setHead('refs/heads/feature');
Merge.commit(repo: conflictRepo, commit: commit);
@ -424,7 +425,8 @@ void main() {
oid: conflictBranch.target,
);
conflictRepo.checkout(target: 'refs/heads/our-conflict');
Checkout.reference(repo: conflictRepo, name: 'refs/heads/our-conflict');
conflictRepo.setHead('refs/heads/our-conflict');
Merge.commit(repo: conflictRepo, commit: commit);
@ -455,7 +457,8 @@ void main() {
oid: conflictBranch.target,
);
conflictRepo.checkout(target: 'refs/heads/feature');
Checkout.reference(repo: conflictRepo, name: 'refs/heads/feature');
conflictRepo.setHead('refs/heads/feature');
Merge.commit(repo: conflictRepo, commit: commit);