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

Add test for amending a merge commit

Browse source
This commit is contained in:
Luka Markušić 2022-09-10 17:00:40 +02:00
parent 4c7d363959
commit 0141bbde0e
26 changed files with 78 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1 @@
new feature commit

0
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/FETCH_HEAD Normal file
View file

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/HEAD Normal file
View file

@ -0,0 +1 @@
ref: refs/heads/development-branch

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

@ -0,0 +1 @@
a69464e3729a09e3a526d4a2db209ee43e64ba1c

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

@ -0,0 +1,10 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[user]
email = CI@example.com
name = CI
[commit]
gpgSign = false

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/description Normal file
View file

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

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

Binary file not shown.

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

@ -0,0 +1,6 @@
# 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]
# *~

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

@ -0,0 +1,5 @@
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.

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

@ -0,0 +1,2 @@
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.

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

@ -0,0 +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

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

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/47/d2739ba2c34690248c8f91b84bb54e8936899a Normal file
View file

Binary file not shown.

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

Binary file not shown.

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

@ -0,0 +1,2 @@
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/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea Normal file
View file

Binary file not shown.

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

@ -0,0 +1 @@
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/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c Normal file
View file

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

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

@ -0,0 +1 @@
77e1bb1effc5857c4d701219a001823432e3586d

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

@ -0,0 +1 @@
5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file Normal file
View file

@ -0,0 +1 @@
content

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file Normal file
View file

@ -0,0 +1 @@
new content

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

@ -0,0 +1 @@
content