1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-19 21:28:28 +02:00

add tests for diffing

This commit is contained in:
Jesse Duffield 2021-04-06 13:54:55 +10:00
parent f4e552f982
commit 12ca922a41
122 changed files with 276 additions and 0 deletions

View File

@ -0,0 +1 @@
test

View File

@ -0,0 +1 @@
ref: refs/heads/branch2

View 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

View File

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

Binary file not shown.

View 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

View 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

View File

@ -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

View File

@ -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

View 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

View File

@ -0,0 +1,2 @@
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ�w.ス��モ[H
矢y�5�来ミ(桍ァ ^-ンW(x9

View 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â

View 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

View File

@ -0,0 +1 @@
a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676

View File

@ -0,0 +1 @@
144da8a531224129210249f43dded86056891506

View File

@ -0,0 +1 @@
test0

View File

@ -0,0 +1 @@
test1

View File

@ -0,0 +1 @@
test2

View File

@ -0,0 +1 @@
line one

View 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}]}

View 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

View File

@ -0,0 +1 @@
{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 }

View File

@ -0,0 +1 @@
asd

View File

@ -0,0 +1 @@
ref: refs/heads/branch2

View 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

View File

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

Binary file not shown.

View 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

View 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

View File

@ -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

View File

@ -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

View 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ª

View File

@ -0,0 +1,2 @@
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ�w.ス��モ[H
矢y�5�来ミ(桍ァ ^-ンW(x9

View File

@ -0,0 +1 @@
0804f2069f5af172770da3d231be982ca320bf8b

View File

@ -0,0 +1 @@
06da465196938ea235323950ee451ffb36a431cf

View File

@ -0,0 +1 @@
test0

View File

@ -0,0 +1 @@
test1

View File

@ -0,0 +1 @@
test2

View File

@ -0,0 +1 @@
line one

View 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}]}

View 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

View File

@ -0,0 +1 @@
{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 }

View File

@ -0,0 +1 @@
asd

View File

@ -0,0 +1 @@
ref: refs/heads/branch2

View 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

View File

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

Binary file not shown.

View 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

View 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

View File

@ -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

View File

@ -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

View 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?έ�+ό

View 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

View 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ù

Some files were not shown because too many files have changed in this diff Show More