mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-23 21:51:07 +02:00
add tests for diffing
This commit is contained in:
parent
f4e552f982
commit
12ca922a41
test/integration
diffing
expected
.git_keep
COMMIT_EDITMSGFETCH_HEADHEADconfigdescriptionindex
file0file1file2file4info
logs
objects
05
0c
14
18
1e
2d
38
3b
3d
57
59
75
8e
96
9e
a1
a5
d0
d1
e5
e7
f6
refs/heads
diffing2
expected
.git_keep
COMMIT_EDITMSGFETCH_HEADHEADconfigdescriptionindex
file0file1file2file4info
logs
objects
06
08
0c
18
1b
1e
2d
38
3b
3d
59
6d
7b
8e
9e
a1
a5
c6
d0
e5
e7
e8
refs/heads
diffing3/expected/.git_keep
@ -0,0 +1 @@
|
||||
test
|
0
test/integration/diffing/expected/.git_keep/FETCH_HEAD
Normal file
0
test/integration/diffing/expected/.git_keep/FETCH_HEAD
Normal file
1
test/integration/diffing/expected/.git_keep/HEAD
Normal file
1
test/integration/diffing/expected/.git_keep/HEAD
Normal file
@ -0,0 +1 @@
|
||||
ref: refs/heads/branch2
|
10
test/integration/diffing/expected/.git_keep/config
Normal file
10
test/integration/diffing/expected/.git_keep/config
Normal file
@ -0,0 +1,10 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
1
test/integration/diffing/expected/.git_keep/description
Normal file
1
test/integration/diffing/expected/.git_keep/description
Normal file
@ -0,0 +1 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
BIN
test/integration/diffing/expected/.git_keep/index
Normal file
BIN
test/integration/diffing/expected/.git_keep/index
Normal file
Binary file not shown.
7
test/integration/diffing/expected/.git_keep/info/exclude
Normal file
7
test/integration/diffing/expected/.git_keep/info/exclude
Normal file
@ -0,0 +1,7 @@
|
||||
# git ls-files --others --exclude-from=.git/info/exclude
|
||||
# Lines that start with '#' are comments.
|
||||
# For a project mostly in C, the following would be a good set of
|
||||
# exclude patterns (uncomment them if you want to use them):
|
||||
# *.[oa]
|
||||
# *~
|
||||
.DS_Store
|
9
test/integration/diffing/expected/.git_keep/logs/HEAD
Normal file
9
test/integration/diffing/expected/.git_keep/logs/HEAD
Normal file
@ -0,0 +1,9 @@
|
||||
0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI <CI@example.com> 1617680560 +1000 commit (initial): file0
|
||||
5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI <CI@example.com> 1617680560 +1000 commit: file1
|
||||
d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI <CI@example.com> 1617680560 +1000 commit: file2
|
||||
0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000 commit: file4
|
||||
144da8a531224129210249f43dded86056891506 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000 checkout: moving from master to branch2
|
||||
144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI <CI@example.com> 1617680561 +1000 commit: file4
|
||||
96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI <CI@example.com> 1617680561 +1000 commit: file4
|
||||
75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI <CI@example.com> 1617680561 +1000 commit: file2
|
||||
f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI <CI@example.com> 1617680570 +1000 commit: test
|
@ -0,0 +1,5 @@
|
||||
0000000000000000000000000000000000000000 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000 branch: Created from HEAD
|
||||
144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI <CI@example.com> 1617680561 +1000 commit: file4
|
||||
96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI <CI@example.com> 1617680561 +1000 commit: file4
|
||||
75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI <CI@example.com> 1617680561 +1000 commit: file2
|
||||
f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI <CI@example.com> 1617680570 +1000 commit: test
|
@ -0,0 +1,4 @@
|
||||
0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI <CI@example.com> 1617680560 +1000 commit (initial): file0
|
||||
5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI <CI@example.com> 1617680560 +1000 commit: file1
|
||||
d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI <CI@example.com> 1617680560 +1000 commit: file2
|
||||
0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000 commit: file4
|
BIN
test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879
Normal file
Binary file not shown.
2
test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506
Normal file
2
test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506
Normal file
@ -0,0 +1,2 @@
|
||||
x�ÎA
|
||||
Â0@Q×9Eö‚d’I2"BW=Æ$N°`l)<¾=‚ÛÏ[üºö¾ìOcWµ‘ÅieR ÌU²ÔK–B…°EŸK’æÉ™Mv}ë"0d¦À
s@*k¨±Fd‡F>ã¹îvšíušïú•¾½ôR×~³� 'r1�=ƒsÎõ˜ú'7my)šéÍ8N
|
BIN
test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
Normal file
Binary file not shown.
2
test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641
Normal file
2
test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641
Normal file
@ -0,0 +1,2 @@
|
||||
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ�w.ス��モ[H
|
||||
矢y�5�来ミ(桍ァ^-ンW(x9
|
2
test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf
Normal file
2
test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf
Normal file
@ -0,0 +1,2 @@
|
||||
xŤŽK
|
||||
�0@»Î)f_(3ů�Rpĺ1&ăHSERčń+=AwŹÇ[<Ůj]P¶—v¨Â„)ŠdĚ,Ěvrq.’8‡yrjFź}ôdv>ôŐ ¤@ÉQqźe§%xöĄ8ôÁZáŕ˛ţĐđ»=·†úa|č‡ëľęM¶zŠ”b‡!"\ ÍiĎ©¦ćf^V%óHr8â
|
BIN
test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6
Normal file
Binary file not shown.
BIN
test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a
Normal file
BIN
test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a
Normal file
Binary file not shown.
3
test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc
Normal file
3
test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc
Normal file
@ -0,0 +1,3 @@
|
||||
x�ÎM
|
||||
Â0@a×9Eö‚dò33¡«cšL°ÐØR"x|{·�oñòÖÚÒ-þÒU«D˜¼—ì™Ñ¯³`Õ�«Ä*Iiàƒ˜]}wKiPJ‰�‰|ÄÀe.Aj¥ÀRÊH>#ŸþÚ;Nö>NOýJÛW½å=, ²Kö
|
||||
Î9sÖsªëŸÜÔeUo~b,9O
|
@ -0,0 +1 @@
|
||||
a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676
|
@ -0,0 +1 @@
|
||||
144da8a531224129210249f43dded86056891506
|
1
test/integration/diffing/expected/file0
Normal file
1
test/integration/diffing/expected/file0
Normal file
@ -0,0 +1 @@
|
||||
test0
|
1
test/integration/diffing/expected/file1
Normal file
1
test/integration/diffing/expected/file1
Normal file
@ -0,0 +1 @@
|
||||
test1
|
1
test/integration/diffing/expected/file2
Normal file
1
test/integration/diffing/expected/file2
Normal file
@ -0,0 +1 @@
|
||||
test2
|
1
test/integration/diffing/expected/file4
Normal file
1
test/integration/diffing/expected/file4
Normal file
@ -0,0 +1 @@
|
||||
line one
|
1
test/integration/diffing/recording.json
Normal file
1
test/integration/diffing/recording.json
Normal file
@ -0,0 +1 @@
|
||||
{"KeyEvents":[{"Timestamp":497,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1570,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1882,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2258,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2514,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3602,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5057,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5250,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5410,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6010,"Mod":2,"Key":16,"Ch":16},{"Timestamp":6730,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7106,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8090,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8330,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8545,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8601,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8778,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8809,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9074,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9722,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
|
38
test/integration/diffing/setup.sh
Normal file
38
test/integration/diffing/setup.sh
Normal file
@ -0,0 +1,38 @@
|
||||
#!/bin/sh
|
||||
|
||||
cd $1
|
||||
|
||||
git init
|
||||
|
||||
git config user.email "CI@example.com"
|
||||
git config user.name "CI"
|
||||
|
||||
echo test0 > file0
|
||||
git add .
|
||||
git commit -am file0
|
||||
|
||||
echo test1 > file1
|
||||
git add .
|
||||
git commit -am file1
|
||||
|
||||
echo test2 > file2
|
||||
git add .
|
||||
git commit -am file2
|
||||
|
||||
echo "line one" > file4
|
||||
git add .
|
||||
git commit -am file4
|
||||
|
||||
git checkout -b branch2
|
||||
|
||||
echo "line two" >> file4
|
||||
git add .
|
||||
git commit -am file4
|
||||
|
||||
echo "line three" >> file4
|
||||
git add .
|
||||
git commit -am file4
|
||||
|
||||
echo "line two" >> file2
|
||||
git add .
|
||||
git commit -am file2
|
1
test/integration/diffing/test.json
Normal file
1
test/integration/diffing/test.json
Normal file
@ -0,0 +1 @@
|
||||
{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 }
|
@ -0,0 +1 @@
|
||||
asd
|
0
test/integration/diffing2/expected/.git_keep/FETCH_HEAD
Normal file
0
test/integration/diffing2/expected/.git_keep/FETCH_HEAD
Normal file
1
test/integration/diffing2/expected/.git_keep/HEAD
Normal file
1
test/integration/diffing2/expected/.git_keep/HEAD
Normal file
@ -0,0 +1 @@
|
||||
ref: refs/heads/branch2
|
10
test/integration/diffing2/expected/.git_keep/config
Normal file
10
test/integration/diffing2/expected/.git_keep/config
Normal file
@ -0,0 +1,10 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
1
test/integration/diffing2/expected/.git_keep/description
Normal file
1
test/integration/diffing2/expected/.git_keep/description
Normal file
@ -0,0 +1 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
BIN
test/integration/diffing2/expected/.git_keep/index
Normal file
BIN
test/integration/diffing2/expected/.git_keep/index
Normal file
Binary file not shown.
@ -0,0 +1,7 @@
|
||||
# git ls-files --others --exclude-from=.git/info/exclude
|
||||
# Lines that start with '#' are comments.
|
||||
# For a project mostly in C, the following would be a good set of
|
||||
# exclude patterns (uncomment them if you want to use them):
|
||||
# *.[oa]
|
||||
# *~
|
||||
.DS_Store
|
9
test/integration/diffing2/expected/.git_keep/logs/HEAD
Normal file
9
test/integration/diffing2/expected/.git_keep/logs/HEAD
Normal file
@ -0,0 +1,9 @@
|
||||
0000000000000000000000000000000000000000 7bf3d13079ced18f5b00e29c48c777e23f687d0a CI <CI@example.com> 1617680651 +1000 commit (initial): file0
|
||||
7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI <CI@example.com> 1617680651 +1000 commit: file1
|
||||
e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI <CI@example.com> 1617680651 +1000 commit: file2
|
||||
c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000 commit: file4
|
||||
06da465196938ea235323950ee451ffb36a431cf 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000 checkout: moving from master to branch2
|
||||
06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI <CI@example.com> 1617680651 +1000 commit: file4
|
||||
6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI <CI@example.com> 1617680651 +1000 commit: file4
|
||||
a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI <CI@example.com> 1617680651 +1000 commit: file2
|
||||
1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI <CI@example.com> 1617680662 +1000 commit: asd
|
@ -0,0 +1,5 @@
|
||||
0000000000000000000000000000000000000000 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000 branch: Created from HEAD
|
||||
06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI <CI@example.com> 1617680651 +1000 commit: file4
|
||||
6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI <CI@example.com> 1617680651 +1000 commit: file4
|
||||
a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI <CI@example.com> 1617680651 +1000 commit: file2
|
||||
1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI <CI@example.com> 1617680662 +1000 commit: asd
|
@ -0,0 +1,4 @@
|
||||
0000000000000000000000000000000000000000 7bf3d13079ced18f5b00e29c48c777e23f687d0a CI <CI@example.com> 1617680651 +1000 commit (initial): file0
|
||||
7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI <CI@example.com> 1617680651 +1000 commit: file1
|
||||
e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI <CI@example.com> 1617680651 +1000 commit: file2
|
||||
c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000 commit: file4
|
BIN
test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Normal file
Binary file not shown.
3
test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7
Normal file
3
test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7
Normal file
@ -0,0 +1,3 @@
|
||||
x�Î1
|
||||
Ã0@ÑÎ>…÷B±”H–¡”B¦C±eHš\èñ›#tý¼áçm]çæ!á¥fÞbdBÔŒ"
|
||||
Ú¤\-IÕ¾jáh1IIÝ®‡½›W€",&¢e"Ò^j&2ƒ.Æ©C¢ré09ý´×vøaô÷a|ÚW×}±[ÞÖ‡†È˜À_!„àÎzN5û“»:/†î”?9ª
|
BIN
test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8
Normal file
Binary file not shown.
2
test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641
Normal file
2
test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641
Normal file
@ -0,0 +1,2 @@
|
||||
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ�w.ス��モ[H
|
||||
矢y�5�来ミ(桍ァ^-ンW(x9
|
BIN
test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a
Normal file
Binary file not shown.
BIN
test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e
Normal file
BIN
test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e
Normal file
Binary file not shown.
@ -0,0 +1 @@
|
||||
0804f2069f5af172770da3d231be982ca320bf8b
|
@ -0,0 +1 @@
|
||||
06da465196938ea235323950ee451ffb36a431cf
|
1
test/integration/diffing2/expected/file0
Normal file
1
test/integration/diffing2/expected/file0
Normal file
@ -0,0 +1 @@
|
||||
test0
|
1
test/integration/diffing2/expected/file1
Normal file
1
test/integration/diffing2/expected/file1
Normal file
@ -0,0 +1 @@
|
||||
test1
|
1
test/integration/diffing2/expected/file2
Normal file
1
test/integration/diffing2/expected/file2
Normal file
@ -0,0 +1 @@
|
||||
test2
|
1
test/integration/diffing2/expected/file4
Normal file
1
test/integration/diffing2/expected/file4
Normal file
@ -0,0 +1 @@
|
||||
line one
|
1
test/integration/diffing2/recording.json
Normal file
1
test/integration/diffing2/recording.json
Normal file
@ -0,0 +1 @@
|
||||
{"KeyEvents":[{"Timestamp":819,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1236,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1491,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1899,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3115,"Mod":0,"Key":256,"Ch":87},{"Timestamp":3539,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3875,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4315,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5291,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6643,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7211,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7475,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7627,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8227,"Mod":2,"Key":16,"Ch":16},{"Timestamp":8770,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8963,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9227,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9947,"Mod":0,"Key":260,"Ch":0},{"Timestamp":10379,"Mod":0,"Key":256,"Ch":99},{"Timestamp":10635,"Mod":0,"Key":256,"Ch":97},{"Timestamp":10674,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10731,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11203,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11715,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
|
38
test/integration/diffing2/setup.sh
Normal file
38
test/integration/diffing2/setup.sh
Normal file
@ -0,0 +1,38 @@
|
||||
#!/bin/sh
|
||||
|
||||
cd $1
|
||||
|
||||
git init
|
||||
|
||||
git config user.email "CI@example.com"
|
||||
git config user.name "CI"
|
||||
|
||||
echo test0 > file0
|
||||
git add .
|
||||
git commit -am file0
|
||||
|
||||
echo test1 > file1
|
||||
git add .
|
||||
git commit -am file1
|
||||
|
||||
echo test2 > file2
|
||||
git add .
|
||||
git commit -am file2
|
||||
|
||||
echo "line one" > file4
|
||||
git add .
|
||||
git commit -am file4
|
||||
|
||||
git checkout -b branch2
|
||||
|
||||
echo "line two" >> file4
|
||||
git add .
|
||||
git commit -am file4
|
||||
|
||||
echo "line three" >> file4
|
||||
git add .
|
||||
git commit -am file4
|
||||
|
||||
echo "line two" >> file2
|
||||
git add .
|
||||
git commit -am file2
|
1
test/integration/diffing2/test.json
Normal file
1
test/integration/diffing2/test.json
Normal file
@ -0,0 +1 @@
|
||||
{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 }
|
@ -0,0 +1 @@
|
||||
asd
|
0
test/integration/diffing3/expected/.git_keep/FETCH_HEAD
Normal file
0
test/integration/diffing3/expected/.git_keep/FETCH_HEAD
Normal file
1
test/integration/diffing3/expected/.git_keep/HEAD
Normal file
1
test/integration/diffing3/expected/.git_keep/HEAD
Normal file
@ -0,0 +1 @@
|
||||
ref: refs/heads/branch2
|
10
test/integration/diffing3/expected/.git_keep/config
Normal file
10
test/integration/diffing3/expected/.git_keep/config
Normal file
@ -0,0 +1,10 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
1
test/integration/diffing3/expected/.git_keep/description
Normal file
1
test/integration/diffing3/expected/.git_keep/description
Normal file
@ -0,0 +1 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
BIN
test/integration/diffing3/expected/.git_keep/index
Normal file
BIN
test/integration/diffing3/expected/.git_keep/index
Normal file
Binary file not shown.
@ -0,0 +1,7 @@
|
||||
# git ls-files --others --exclude-from=.git/info/exclude
|
||||
# Lines that start with '#' are comments.
|
||||
# For a project mostly in C, the following would be a good set of
|
||||
# exclude patterns (uncomment them if you want to use them):
|
||||
# *.[oa]
|
||||
# *~
|
||||
.DS_Store
|
9
test/integration/diffing3/expected/.git_keep/logs/HEAD
Normal file
9
test/integration/diffing3/expected/.git_keep/logs/HEAD
Normal file
@ -0,0 +1,9 @@
|
||||
0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI <CI@example.com> 1617680695 +1000 commit (initial): file0
|
||||
13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI <CI@example.com> 1617680695 +1000 commit: file1
|
||||
57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI <CI@example.com> 1617680695 +1000 commit: file2
|
||||
4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000 commit: file4
|
||||
b25b8446022fb5fcded2bab1ed2b02828a5c4d0b b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000 checkout: moving from master to branch2
|
||||
b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI <CI@example.com> 1617680695 +1000 commit: file4
|
||||
ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI <CI@example.com> 1617680695 +1000 commit: file4
|
||||
275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI <CI@example.com> 1617680695 +1000 commit: file2
|
||||
1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI <CI@example.com> 1617680702 +1000 commit: asd
|
@ -0,0 +1,5 @@
|
||||
0000000000000000000000000000000000000000 b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000 branch: Created from HEAD
|
||||
b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI <CI@example.com> 1617680695 +1000 commit: file4
|
||||
ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI <CI@example.com> 1617680695 +1000 commit: file4
|
||||
275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI <CI@example.com> 1617680695 +1000 commit: file2
|
||||
1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI <CI@example.com> 1617680702 +1000 commit: asd
|
@ -0,0 +1,4 @@
|
||||
0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI <CI@example.com> 1617680695 +1000 commit (initial): file0
|
||||
13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI <CI@example.com> 1617680695 +1000 commit: file1
|
||||
57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI <CI@example.com> 1617680695 +1000 commit: file2
|
||||
4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000 commit: file4
|
BIN
test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879
Normal file
BIN
test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879
Normal file
Binary file not shown.
2
test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5
Normal file
2
test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5
Normal file
@ -0,0 +1,2 @@
|
||||
x�ΝA
|
||||
Β0@QΧ9Ε왉ΣID„®z�¤™`΅!¥Dπψφn?ώ�j];σ¥f@v7 IUsΆ!HΜd†c*\Π§\Ό+³wρΣίν€i†Η4ΏμλΎΩmiυ $dDΡ®„�ξ¬η¤Ϋ�ά•u3t?έ�+ό
|
BIN
test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Normal file
BIN
test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Normal file
Binary file not shown.
BIN
test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
Normal file
BIN
test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
Normal file
Binary file not shown.
2
test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a
Normal file
2
test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a
Normal file
@ -0,0 +1,2 @@
|
||||
x�ÎA
|
||||
Â@Fa×sŠÙ’Ä6™¡«#Nÿb¡µ¥ŒàñíÜ~¼Å+ë²L5r–SÝ�3mE¼HJJƒàé:"§Ñ›Ñ5XN
g›ïx×(ÖB= ³P!óLš<1n0\™-ø§¾Ö=v}¼uý__¶—².÷Èʦ‰4·ñÌD=¦*þÌÃ8Í�ð?b9
|
2
test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117
Normal file
2
test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117
Normal file
@ -0,0 +1,2 @@
|
||||
x�ŽA
|
||||
Â0E]ç³dfÒ¤("tÕc$q‚…Æ–Áã›#¸{|Þ‡—÷Z×$|i§*Øgb¾Œåâ-«f"ÒbÅ ÙbâdŽxê»A)‰ìˆ¬>e'Ê;ØèŠX‡¨ƒvÝ ?íµŸ0/0ÍËC¿±›Þò^ï@žFß�âàJˆhúÚ£šþ©›²n:˜3Ð8ù
|
BIN
test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85
Normal file
BIN
test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85
Normal file
Binary file not shown.
BIN
test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
Normal file
BIN
test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user