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

test: improve coverage

Browse source
This commit is contained in:
Aleksey Kulikov 2021-10-15 17:37:38 +03:00
parent d75acbfdd3
commit d6eae1e9ed
71 changed files with 710 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/assets/mergerepo/.gitdir/COMMIT_EDITMSG
View file

@ -1 +1 @@
master conflict commit
delete their for conflict

BIN
test/assets/mergerepo/.gitdir/index
View file

Binary file not shown.

11
test/assets/mergerepo/.gitdir/logs/HEAD
View file

@ -13,3 +13,14 @@ fc38877b2552ab554752d9a77e1f48f738cca79b 5aecfa0fb97eadaac050ccb99f03c3fb65460ad
821ed6e80627b8769d170a293862f9fc60825226 47af50e6a799d7d0dde6630d2644f9484fb670f7 Aleksey Kulikov <skinny.mind@gmail.com> 1631172155 +0300 commit: conflict branch commit
47af50e6a799d7d0dde6630d2644f9484fb670f7 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov <skinny.mind@gmail.com> 1631172159 +0300 checkout: moving from conflict-branch to master
821ed6e80627b8769d170a293862f9fc60825226 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov <skinny.mind@gmail.com> 1631172175 +0300 commit: master conflict commit
14905459d775f3f56a39ebc2ff081163f7da3529 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov <skinny.mind@gmail.com> 1634223805 +0300 checkout: moving from master to ancestor-conflict
5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 7606a0d606a74ee5f0761c6e358c2f90405c94ad Aleksey Kulikov <skinny.mind@gmail.com> 1634223835 +0300 commit: conflict with ancestor
7606a0d606a74ee5f0761c6e358c2f90405c94ad 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov <skinny.mind@gmail.com> 1634223845 +0300 checkout: moving from ancestor-conflict to feature
5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 2ee89b2f7124b8e4632bc6a20774a90b795245e4 Aleksey Kulikov <skinny.mind@gmail.com> 1634223881 +0300 commit: conflict with ancestor
2ee89b2f7124b8e4632bc6a20774a90b795245e4 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov <skinny.mind@gmail.com> 1634225232 +0300 checkout: moving from feature to master
14905459d775f3f56a39ebc2ff081163f7da3529 2ee89b2f7124b8e4632bc6a20774a90b795245e4 Aleksey Kulikov <skinny.mind@gmail.com> 1634303915 +0300 checkout: moving from master to our-conflict
2ee89b2f7124b8e4632bc6a20774a90b795245e4 0db17b23a1acd67d5e44650d61aac7d4d83ec193 Aleksey Kulikov <skinny.mind@gmail.com> 1634303926 +0300 commit: delete our for conflict
0db17b23a1acd67d5e44650d61aac7d4d83ec193 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov <skinny.mind@gmail.com> 1634303933 +0300 checkout: moving from our-conflict to master
14905459d775f3f56a39ebc2ff081163f7da3529 7606a0d606a74ee5f0761c6e358c2f90405c94ad Aleksey Kulikov <skinny.mind@gmail.com> 1634304003 +0300 checkout: moving from master to their-conflict
7606a0d606a74ee5f0761c6e358c2f90405c94ad 0e409d66f701eea5038fe508ead4c098da699d2c Aleksey Kulikov <skinny.mind@gmail.com> 1634304018 +0300 commit: delete their for conflict
0e409d66f701eea5038fe508ead4c098da699d2c 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov <skinny.mind@gmail.com> 1634304023 +0300 checkout: moving from their-conflict to master

2
test/assets/mergerepo/.gitdir/logs/refs/heads/ancestor-conflict Normal file
View file

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov <skinny.mind@gmail.com> 1634223805 +0300 branch: Created from 5aecfa0
5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 7606a0d606a74ee5f0761c6e358c2f90405c94ad Aleksey Kulikov <skinny.mind@gmail.com> 1634223835 +0300 commit: conflict with ancestor

1
test/assets/mergerepo/.gitdir/logs/refs/heads/feature
View file

@ -2,3 +2,4 @@
f17d0d48eae3aa08cecf29128a35e310c97b3521 6cbc22e509d72758ab4c8d9f287ea846b90c448b Aleksey Kulikov <skinny.mind@gmail.com> 1626091020 +0300 commit: add feature file
6cbc22e509d72758ab4c8d9f287ea846b90c448b fc38877b2552ab554752d9a77e1f48f738cca79b Aleksey Kulikov <skinny.mind@gmail.com> 1626091054 +0300 commit: edit feature file
fc38877b2552ab554752d9a77e1f48f738cca79b 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov <skinny.mind@gmail.com> 1626091274 +0300 commit: add another feature file
5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 2ee89b2f7124b8e4632bc6a20774a90b795245e4 Aleksey Kulikov <skinny.mind@gmail.com> 1634223881 +0300 commit: conflict with ancestor

2
test/assets/mergerepo/.gitdir/logs/refs/heads/our-conflict Normal file
View file

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 2ee89b2f7124b8e4632bc6a20774a90b795245e4 Aleksey Kulikov <skinny.mind@gmail.com> 1634303915 +0300 branch: Created from 2ee89b2
2ee89b2f7124b8e4632bc6a20774a90b795245e4 0db17b23a1acd67d5e44650d61aac7d4d83ec193 Aleksey Kulikov <skinny.mind@gmail.com> 1634303926 +0300 commit: delete our for conflict

2
test/assets/mergerepo/.gitdir/logs/refs/heads/their-conflict Normal file
View file

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 7606a0d606a74ee5f0761c6e358c2f90405c94ad Aleksey Kulikov <skinny.mind@gmail.com> 1634304003 +0300 branch: Created from 7606a0d
7606a0d606a74ee5f0761c6e358c2f90405c94ad 0e409d66f701eea5038fe508ead4c098da699d2c Aleksey Kulikov <skinny.mind@gmail.com> 1634304018 +0300 commit: delete their for conflict

BIN
test/assets/mergerepo/.gitdir/objects/0d/b17b23a1acd67d5e44650d61aac7d4d83ec193 Normal file
View file

Binary file not shown.

2
test/assets/mergerepo/.gitdir/objects/0e/409d66f701eea5038fe508ead4c098da699d2c Normal file
View file

@ -0,0 +1,2 @@
xĄŽKj1łÖ)z0úKĆ$ëśBęî‰ĹčcĆrŔ·Ďř ŢÔâA=
Gke‚vúcîĚ@¬˛ÖŮť<>Í6ć@hbÎʸÄZ¦Ś~!˘(niç>!x铤<17>ev« ^ˇgă"ęu‘V:\l"‘ó:vř®ĽÝů ?ŹZ¶ńçűVzžZéôőŰR©'íĘk[Eř”FJq¬Gčä7.qĺÉ0Ż\vXŹ}­§ř‚˛QŢ

BIN
test/assets/mergerepo/.gitdir/objects/1e/a09ccce9682b1424ae282d060421876bad7f18 Normal file
View file

Binary file not shown.

BIN
test/assets/mergerepo/.gitdir/objects/2e/e89b2f7124b8e4632bc6a20774a90b795245e4 Normal file
View file

Binary file not shown.

BIN
test/assets/mergerepo/.gitdir/objects/76/06a0d606a74ee5f0761c6e358c2f90405c94ad Normal file
View file

Binary file not shown.

BIN
test/assets/mergerepo/.gitdir/objects/d8/ab96fc96ed0a33b98895e7c5434fe9ee195082 Normal file
View file

Binary file not shown.

BIN
test/assets/mergerepo/.gitdir/objects/d9/9d64a90db7f69fa8cff8c7b01fba011379165f Normal file
View file

Binary file not shown.

BIN
test/assets/mergerepo/.gitdir/objects/dd/20ffc2e349da86f4c5dda87ac8d1602e063f54 Normal file
View file

Binary file not shown.

BIN
test/assets/mergerepo/.gitdir/objects/de/1b22b432b74b48b7dc38bb135ae20abc69ddd8 Normal file
View file

Binary file not shown.

1
test/assets/mergerepo/.gitdir/refs/heads/ancestor-conflict Normal file
View file

@ -0,0 +1 @@
7606a0d606a74ee5f0761c6e358c2f90405c94ad

2
test/assets/mergerepo/.gitdir/refs/heads/feature
View file

@ -1 +1 @@
5aecfa0fb97eadaac050ccb99f03c3fb65460ad4
2ee89b2f7124b8e4632bc6a20774a90b795245e4

1
test/assets/mergerepo/.gitdir/refs/heads/our-conflict Normal file
View file

@ -0,0 +1 @@
0db17b23a1acd67d5e44650d61aac7d4d83ec193

1
test/assets/mergerepo/.gitdir/refs/heads/their-conflict Normal file
View file

@ -0,0 +1 @@
0e409d66f701eea5038fe508ead4c098da699d2c