mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

update test

Browse source
This commit is contained in:
Jesse Duffield 2022-09-17 11:58:24 -07:00 • committed by Luka Markušić
parent 0141bbde0e
commit 23d39c79b2
30 changed files with 58 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG
View file

@ -1 +1 @@
new feature commit
fixup! Merge branch 'feature-branch' into development-branch

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD
View file

@ -1 +1 @@
a69464e3729a09e3a526d4a2db209ee43e64ba1c
7802c86c6ce62289e32aa13d0c85dc3f733195cb

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config
View file

@ -3,6 +3,8 @@
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index
View file

Binary file not shown.

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude
View file

@ -4,3 +4,4 @@
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~
.DS_Store

17
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD
View file

@ -1,5 +1,12 @@
0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 commit (initial): initial commit
a69464e3729a09e3a526d4a2db209ee43e64ba1c a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 checkout: moving from development-branch to feature-branch
a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI <CI@example.com> 1662823399 +0200 commit: new feature commit
5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 checkout: moving from feature-branch to development-branch
a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI <CI@example.com> 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy.
0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 commit (initial): initial commit
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 checkout: moving from development-branch to feature-branch
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440492 -0700 commit: new feature commit
d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 checkout: moving from feature-branch to development-branch
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy.
f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI <CI@example.com> 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch
7802c86c6ce62289e32aa13d0c85dc3f733195cb 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440494 -0700 rebase (start): checkout f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15^
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440494 -0700 rebase: fast-forward
d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440494 -0700 rebase (reset): 'onto'
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440494 -0700 rebase: fast-forward
f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700 rebase (fixup): Merge branch 'feature-branch' into development-branch
f517de66e2a158d4a1d85246611cae9ca23a938d f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700 rebase (finish): returning to refs/heads/development-branch

6
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch
View file

@ -1,2 +1,4 @@
0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 commit (initial): initial commit
a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI <CI@example.com> 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy.
0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 commit (initial): initial commit
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy.
f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI <CI@example.com> 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch
7802c86c6ce62289e32aa13d0c85dc3f733195cb f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700 rebase (finish): refs/heads/development-branch onto 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3

4
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch
View file

@ -1,2 +1,2 @@
0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 branch: Created from HEAD
a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI <CI@example.com> 1662823399 +0200 commit: new feature commit
0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 branch: Created from HEAD
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440492 -0700 commit: new feature commit

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d
View file

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e Normal file
View file

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 Normal file
View file

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 Normal file
View file

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/48/9361eca1233745c15acc9381322e97b4d44b57
View file

Binary file not shown.

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/5e/62a9dc2e1352e7ee6ecf17033e2ed3382efc6f
View file

@ -1,2 +0,0 @@
x<01><>K
Β@]Ο)z/H§g<C2A7>Ι€<CE99><E282AC>U<EFBFBD>Ρ™ΌAΑ|τψΌ€ΛWTΑKΛ4= Χ§²δYRΚΪο-1 lΉR46¶<01>“µ9ΛθVΫ02<>A|#Ρ8Β[-:“q<E2809C>c"xh¬JΞφςX6κzΊvύ›Φ.i™nT©J+ήΗHgfwΠγTΑ<54>Ί›ρ¦ +ϋϊµξ ήή?>

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/63/e06ef6d5baa80461d12e953ee7e75444180d8f Normal file
View file

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea
View file

Binary file not shown.

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/77/e1bb1effc5857c4d701219a001823432e3586d
View file

@ -1 +0,0 @@
x<01><>»j1ESïW¨s´3ÚY B0¸r‘<72>˜]Åï!›|~’ô)Ͻ§9¶Îóµ9Šñ©UÀ±'³"c`VóPx-½`Ô|1<>’|¡ÜmZ±4§’‚ðHI}ë@’ƒRžhG†„I{ûóiÊFèy Œ€ÀJ?zf2s$“Òé½]ÖêNg÷v:ñ¥óvë­ó»ëE(sJîÙ“÷ݾî ÿÔ»ÔO¸©êbw(Ðv¯xù჻.muÜÖmÞ<>î«ÐZ0

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb Normal file
View file

@ -0,0 +1,2 @@
xŤŽMjĂ0F»Ö)¦«¬R$ë×J «,z<>Ńx¦1D–rČńkh<0E>ĺűŢ·xTK™; .~ôĆ ÖŤÝ %k!˛"ŃiFöyśČh‹fĆűÄjĹĆK ‰|v‰‚·„ó`1O1č śQš|6^áÖoµÁĺ
§ËőĚO,ëťż¨–o0!Xç´-uÔZíëŐůÍ»’ůą­źđĂí—!7\čaě[ăă?`^z…‰|ŻkŮÓ_BýśîNš

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 Normal file
View file

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7b/d422e3608d9bcfeef85748c90a5ec114fc2c17 Normal file
View file

Binary file not shown.

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c
View file

@ -1,2 +0,0 @@
x██K
б0@]ГЁ$⌠и╓]УИ8`═1╔DХЯ x╥▐Вxэj-пя╔"`c"▐б Q╟▌яeФDиIa╣OkWTЧТW;`^Ю>/9sщ7╧q╚═В&▌<%╦jё╣tL╨Э╘╚Р.╫Д ~²ЗЭ.ц

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 Normal file
View file

Binary file not shown.

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d Normal file
View file

@ -0,0 +1,2 @@
x…<>¹jADïWt¦HfŽÞ9@ƒ"þˆ9ª-<2D>fwFÆŸï˱£¢ª^òÊÚÚm<C39A> áet€,Gx6J²’R¬ˆg…„9ÇZ´²I§ç9`ÚRÇ2ȦªYBfTöQŒÔXCeñ“bÔÖ{<7B>½Ø?¾êâƒÒÁ1Ñ
‚pæXÜ:Veç7¥Ç¸®<C2B8>Î:<3A>/ïøNm»ãµ¬í<C2AC>´s–Yq4tT^©i_w‰<77>p~âÓú'(÷´”+i<:Ž¿ý@·e¬Tñ…ûºµÝñyL?2#Y|

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 Normal file
View file

@ -0,0 +1,2 @@
xŤŹ»jC1DS߯ŘΕ<C38E>kiB¸r‘Ź<E28098>´»±Á÷<C381><C3B7>C>?’ô©†™9Íië<ߢ§ŃU!WÁ4&Gµ™ŞŃ)#5vĺ¤Í{´šĎÓVş.b‘}˘Š*<2A>Ů‚ Z6 …ŮÇś}Í˙xń-“óÉGS2¬ČR4íáY\<±&MSyŚëÚá|<7C>—óĺMżĘĽÝőą­ó+ř”"˘CptŮąi_w‰ˇ˙ħwí
µ—Ą]á`ZĆŁëń§ඌD?őľnóîř{Lßr[Y»

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch
View file

@ -1 +1 @@
77e1bb1effc5857c4d701219a001823432e3586d
f517de66e2a158d4a1d85246611cae9ca23a938d

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch
View file

@ -1 +1 @@
5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f
d1c7801838f293fe8f4b49dae6b4919d0359e6e6

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file
View file

@ -1 +1 @@
content
initial file content

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file
View file

@ -1 +1 @@
content
post merge file content