mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-11-27 22:38:09 +02:00
refactor integration tests
This commit is contained in:
Jesse Duffield
@@ -1 +0,0 @@
|
||||
4589efcaf3024e841825bb289bb88eb0e4f8530a branch 'master' of ../actual_remote
|
||||
@@ -1 +0,0 @@
|
||||
9013b5f12ca8a0fdd44fbe72028500bbac5c89ee
|
||||
Binary file not shown.
@@ -1,14 +0,0 @@
|
||||
0000000000000000000000000000000000000000 5759b6258419271e67a172e51cd90048dd21f9c0 CI <CI@example.com> 1634896936 +1100 commit (initial): myfile1
|
||||
5759b6258419271e67a172e51cd90048dd21f9c0 476a1939075b60aa47da50a8c40c5b4412a2f18b CI <CI@example.com> 1634896936 +1100 commit: myfile2
|
||||
476a1939075b60aa47da50a8c40c5b4412a2f18b e047462bda495acbe565c85b205d614f38c0a692 CI <CI@example.com> 1634896936 +1100 commit: myfile3
|
||||
e047462bda495acbe565c85b205d614f38c0a692 4589efcaf3024e841825bb289bb88eb0e4f8530a CI <CI@example.com> 1634896936 +1100 commit: myfile4
|
||||
4589efcaf3024e841825bb289bb88eb0e4f8530a 476a1939075b60aa47da50a8c40c5b4412a2f18b CI <CI@example.com> 1634896936 +1100 reset: moving to head^^
|
||||
476a1939075b60aa47da50a8c40c5b4412a2f18b 9013b5f12ca8a0fdd44fbe72028500bbac5c89ee CI <CI@example.com> 1634896936 +1100 commit: myfile4 conflict
|
||||
9013b5f12ca8a0fdd44fbe72028500bbac5c89ee 0fa53867500c0f3a5cca9b2112982795fae51c51 CI <CI@example.com> 1634896936 +1100 commit: 5
|
||||
0fa53867500c0f3a5cca9b2112982795fae51c51 69a5c9fb912112305bfe15272855afb50f6acf4b CI <CI@example.com> 1634896936 +1100 commit: 6
|
||||
69a5c9fb912112305bfe15272855afb50f6acf4b af4c4b2b977f8909e590ea5bc3bab59d991e4c28 CI <CI@example.com> 1634896936 +1100 commit: 7
|
||||
af4c4b2b977f8909e590ea5bc3bab59d991e4c28 4589efcaf3024e841825bb289bb88eb0e4f8530a CI <CI@example.com> 1634896938 +1100 rebase -i (start): checkout 4589efcaf3024e841825bb289bb88eb0e4f8530a
|
||||
4589efcaf3024e841825bb289bb88eb0e4f8530a 5d08d9b6315ddb8fb8372d83b54862ba7d7fdc88 CI <CI@example.com> 1634896942 +1100 rebase -i (continue): myfile4 conflict
|
||||
5d08d9b6315ddb8fb8372d83b54862ba7d7fdc88 7c717449332e4a81f7e5643eef9c95f459444e3f CI <CI@example.com> 1634896942 +1100 rebase -i (pick): 5
|
||||
7c717449332e4a81f7e5643eef9c95f459444e3f ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI <CI@example.com> 1634896942 +1100 rebase -i (pick): 7
|
||||
ae4e33d43751b83fbd0b6f0a1796d58462492e47 ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI <CI@example.com> 1634896942 +1100 rebase -i (finish): returning to refs/heads/master
|
||||
@@ -1,10 +0,0 @@
|
||||
0000000000000000000000000000000000000000 5759b6258419271e67a172e51cd90048dd21f9c0 CI <CI@example.com> 1634896936 +1100 commit (initial): myfile1
|
||||
5759b6258419271e67a172e51cd90048dd21f9c0 476a1939075b60aa47da50a8c40c5b4412a2f18b CI <CI@example.com> 1634896936 +1100 commit: myfile2
|
||||
476a1939075b60aa47da50a8c40c5b4412a2f18b e047462bda495acbe565c85b205d614f38c0a692 CI <CI@example.com> 1634896936 +1100 commit: myfile3
|
||||
e047462bda495acbe565c85b205d614f38c0a692 4589efcaf3024e841825bb289bb88eb0e4f8530a CI <CI@example.com> 1634896936 +1100 commit: myfile4
|
||||
4589efcaf3024e841825bb289bb88eb0e4f8530a 476a1939075b60aa47da50a8c40c5b4412a2f18b CI <CI@example.com> 1634896936 +1100 reset: moving to head^^
|
||||
476a1939075b60aa47da50a8c40c5b4412a2f18b 9013b5f12ca8a0fdd44fbe72028500bbac5c89ee CI <CI@example.com> 1634896936 +1100 commit: myfile4 conflict
|
||||
9013b5f12ca8a0fdd44fbe72028500bbac5c89ee 0fa53867500c0f3a5cca9b2112982795fae51c51 CI <CI@example.com> 1634896936 +1100 commit: 5
|
||||
0fa53867500c0f3a5cca9b2112982795fae51c51 69a5c9fb912112305bfe15272855afb50f6acf4b CI <CI@example.com> 1634896936 +1100 commit: 6
|
||||
69a5c9fb912112305bfe15272855afb50f6acf4b af4c4b2b977f8909e590ea5bc3bab59d991e4c28 CI <CI@example.com> 1634896936 +1100 commit: 7
|
||||
af4c4b2b977f8909e590ea5bc3bab59d991e4c28 ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI <CI@example.com> 1634896942 +1100 rebase -i (finish): refs/heads/master onto 4589efcaf3024e841825bb289bb88eb0e4f8530a
|
||||
@@ -1 +0,0 @@
|
||||
0000000000000000000000000000000000000000 4589efcaf3024e841825bb289bb88eb0e4f8530a CI <CI@example.com> 1634896936 +1100 fetch origin: storing head
|
||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
x��A
|
||||
�0@Q�9E���$3�D��z�$�`��R"����~�◵��[�t껪uUp `�ȇ��Q�C�,:�#�%qD��]_�*�@���(r*YY��x��C�$љ���u��d��t�Oj�S/em7��)D�^�� ����'7�[������8�
|
||||
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
x��A
|
||||
�0@Q�9���4�4�� c�L��!R"����~ ����H|��*x�\��2&��H1r�8֑
|
||||
��J�N���v�f�M�C?b�M/�� ���)0��wG=&]��ξu��6�,�
|
||||
@@ -1,2 +0,0 @@
|
||||
x}α
|
||||
�0�a�<EvA.�%����qI.Xhl)�������
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
x}�M
|
||||
�0@a�9E��$�L2�"BW=�L~P0�� �.\�}|���� C[���k�͈Tt���I����L����YL0Qm����X �$,�C6!��z
|
||||
N8��J&R� �u����y����Y/y�WmxJ!A�gk�QG=�F�Ͻ�q�� ұ8q
|
||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
x}α
|
||||
�0�a�<EvAr��]E�N}�4��`l)||;8��|�_�� �B����Zd�sf.�B�*Jd]f(a��ly�W�R�(y�J9B
|
||||
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
ae4e33d43751b83fbd0b6f0a1796d58462492e47
|
||||
@@ -1 +0,0 @@
|
||||
4589efcaf3024e841825bb289bb88eb0e4f8530a
|
||||
@@ -5,4 +5,4 @@
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[remote "origin"]
|
||||
url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractiveWithDrop/./actual
|
||||
url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractiveWithDrop/actual/./repo
|
||||
@@ -0,0 +1,3 @@
|
||||
x��K
|
||||
�0@]�� ��L~ "t�cL�,[J��=����xumm�
|
||||
��.b� k�0+!*�� ���<!�V1����s�J�)3�1��& �@���%��7���u��h��x���)�����H��� ��9�1���ܴ�.OA��]:O
|
||||
@@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Q�9E��d&�iD��z�4�����D���#����/k�K� tj���}$ȝX�gUe��#'d��`H�n˻��75͢X"RH!3�!a�є@ �JI���n�u�����x�O��S/e�7L)�`� �;�1��O��ז���� 9�
|
||||
@@ -0,0 +1,3 @@
|
||||
x��A
|
||||
�0@Q�9���If�D��z�$�`��R"����~�◵��
|
||||
|��*��)0
|
||||
@@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Q�9��ɤ�$�� c�L��!R"����~ ����H|��*x�\��GM�H1qIk����T%_��w� �n��Џ�k�KnvdJ�!"��wG=&]��ξu��3@,�
|
||||
@@ -0,0 +1,2 @@
|
||||
# pack-refs with: peeled fully-peeled sorted
|
||||
ce137eabb7b8df81d4818ac8a16892b1f7327219 refs/heads/master
|
||||
@@ -3,13 +3,13 @@ myfile4 conflict
|
||||
# Please enter the commit message for your changes. Lines starting
|
||||
# with '#' will be ignored, and an empty message aborts the commit.
|
||||
#
|
||||
# interactive rebase in progress; onto 4589efc
|
||||
# interactive rebase in progress; onto ce137ea
|
||||
# Last command done (1 command done):
|
||||
# pick 9013b5f myfile4 conflict
|
||||
# pick 6ba64de myfile4 conflict
|
||||
# Next commands to do (3 remaining commands):
|
||||
# pick 0fa5386 5
|
||||
# drop 69a5c9f 6
|
||||
# You are currently rebasing branch 'master' on '4589efc'.
|
||||
# pick 6226d76 5
|
||||
# drop 67c0063 6
|
||||
# You are currently rebasing branch 'master' on 'ce137ea'.
|
||||
#
|
||||
# Changes to be committed:
|
||||
# modified: myfile4
|
||||
@@ -0,0 +1 @@
|
||||
ce137eabb7b8df81d4818ac8a16892b1f7327219 branch 'master' of ../origin
|
||||
@@ -0,0 +1 @@
|
||||
6ba64def9b38eb7bcf5aa1a6c513c490967062ad
|
||||
@@ -9,7 +9,7 @@
|
||||
email = CI@example.com
|
||||
name = CI
|
||||
[remote "origin"]
|
||||
url = ../actual_remote
|
||||
url = ../origin
|
||||
fetch = +refs/heads/*:refs/remotes/origin/*
|
||||
[branch "master"]
|
||||
remote = origin
|
||||
Binary file not shown.
@@ -0,0 +1,14 @@
|
||||
0000000000000000000000000000000000000000 fefea9e2c324080a61d03142554b81e410e9c87f CI <CI@example.com> 1648349271 +1100 commit (initial): myfile1
|
||||
fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI <CI@example.com> 1648349271 +1100 commit: myfile2
|
||||
a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI <CI@example.com> 1648349271 +1100 commit: myfile3
|
||||
6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI <CI@example.com> 1648349271 +1100 commit: myfile4
|
||||
ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI <CI@example.com> 1648349271 +1100 reset: moving to HEAD~2
|
||||
a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI <CI@example.com> 1648349271 +1100 commit: myfile4 conflict
|
||||
6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI <CI@example.com> 1648349271 +1100 commit: 5
|
||||
6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI <CI@example.com> 1648349271 +1100 commit: 6
|
||||
67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI <CI@example.com> 1648349271 +1100 commit: 7
|
||||
3c2846a93bb9c2815e3218ac3c906da26d159068 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI <CI@example.com> 1648349273 +1100 rebase -i (start): checkout ce137eabb7b8df81d4818ac8a16892b1f7327219
|
||||
ce137eabb7b8df81d4818ac8a16892b1f7327219 281c7e805fd7bf133611e701ef01f0a4f362f232 CI <CI@example.com> 1648349278 +1100 rebase -i (continue): myfile4 conflict
|
||||
281c7e805fd7bf133611e701ef01f0a4f362f232 d13fd4cd73174c7048108d2dc8d277a8e013d1e4 CI <CI@example.com> 1648349278 +1100 rebase -i (pick): 5
|
||||
d13fd4cd73174c7048108d2dc8d277a8e013d1e4 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI <CI@example.com> 1648349278 +1100 rebase -i (pick): 7
|
||||
72da3b902dcd9e99b21bdc36891e028b8dbfb219 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI <CI@example.com> 1648349278 +1100 rebase -i (finish): returning to refs/heads/master
|
||||
@@ -0,0 +1,10 @@
|
||||
0000000000000000000000000000000000000000 fefea9e2c324080a61d03142554b81e410e9c87f CI <CI@example.com> 1648349271 +1100 commit (initial): myfile1
|
||||
fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI <CI@example.com> 1648349271 +1100 commit: myfile2
|
||||
a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI <CI@example.com> 1648349271 +1100 commit: myfile3
|
||||
6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI <CI@example.com> 1648349271 +1100 commit: myfile4
|
||||
ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI <CI@example.com> 1648349271 +1100 reset: moving to HEAD~2
|
||||
a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI <CI@example.com> 1648349271 +1100 commit: myfile4 conflict
|
||||
6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI <CI@example.com> 1648349271 +1100 commit: 5
|
||||
6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI <CI@example.com> 1648349271 +1100 commit: 6
|
||||
67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI <CI@example.com> 1648349271 +1100 commit: 7
|
||||
3c2846a93bb9c2815e3218ac3c906da26d159068 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI <CI@example.com> 1648349278 +1100 rebase -i (finish): refs/heads/master onto ce137eabb7b8df81d4818ac8a16892b1f7327219
|
||||
@@ -0,0 +1 @@
|
||||
0000000000000000000000000000000000000000 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI <CI@example.com> 1648349271 +1100 fetch origin: storing head
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,4 @@
|
||||
x���
|
||||
�0=�+rd�$�D���o�-
|
||||
֖�Ϸ��u����<�u9���j�@B� "ɐ�
|
||||
A"��1�d6���� ��E|VIR�8p���P� - � >���v��u���Ų��R��f ��C��g���A����&� �8H
|
||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,3 @@
|
||||
x��K
|
||||
�0@]�� ��L~ "t�cL�,[J��=����xumm�
|
||||
��.b� k�0+!*�� ���<!�V1����s�J�)3�1��& �@���%��7���u��h��x���)�����H��� ��9�1���ܴ�.OA��]:O
|
||||
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Q�9E��d&�iD��z�4�����D���#����/k�K� tj���}$ȝX�gUe��#'d��`H�n˻��75͢X"RH!3�!a�є@ �JI���n�u�����x�O��S/e�7L)�`� �;�1��O��ז���� 9�
|
||||
@@ -0,0 +1,3 @@
|
||||
x��A
|
||||
�0@Q�9���If�D��z�$�`��R"����~�◵��
|
||||
|��*��)0
|
||||
@@ -0,0 +1,3 @@
|
||||
x�λ
|
||||
�@@Q������>FR�3v73(�
|
||||
~�)�m/��m��G�(r蛪7�U#�H"��\�T�b�bL5Tn�B��ֲ��{lY�M�2'D̀j�%'2br�������_����2�O=�e�zLA8�)�?"���S]�p�q��Z7�
|
||||
@@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Q�9��ɤ�$�� c�L��!R"����~ ����H|��*x�\��GM�H1qIk����T%_��w� �n��Џ�k�KnvdJ�!"��wG=&]��ξu��3@,�
|
||||
@@ -0,0 +1 @@
|
||||
72da3b902dcd9e99b21bdc36891e028b8dbfb219
|
||||
@@ -0,0 +1 @@
|
||||
ce137eabb7b8df81d4818ac8a16892b1f7327219
|
||||
@@ -1,2 +0,0 @@
|
||||
x��A
|
||||
�0@Q�9E���$3�D��z�$�`��R"����~�◵��[�t껪uUp `�ȇ��Q�C�,:�#�%qD��]_�*�@���(r*YY��x��C�$љ���u��d��t�Oj�S/em7��)D�^�� ����'7�[������8�
|
||||
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
x��A
|
||||
�0@Q�9���4�4�� c�L��!R"����~ ����H|��*x�\��2&��H1r�8֑
|
||||
��J�N���v�f�M�C?b�M/�� ���)0��wG=&]��ξu��6�,�
|
||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
# pack-refs with: peeled fully-peeled sorted
|
||||
4589efcaf3024e841825bb289bb88eb0e4f8530a refs/heads/master
|
||||
@@ -25,9 +25,9 @@ git add .
|
||||
git commit -am "myfile4"
|
||||
|
||||
cd ..
|
||||
git clone --bare ./actual actual_remote
|
||||
git clone --bare ./repo origin
|
||||
|
||||
cd actual
|
||||
cd repo
|
||||
|
||||
git reset --hard HEAD~2
|
||||
|
||||
@@ -47,7 +47,7 @@ echo test > myfile7
|
||||
git add .
|
||||
git commit -am "7"
|
||||
|
||||
git remote add origin ../actual_remote
|
||||
git remote add origin ../origin
|
||||
git fetch origin
|
||||
git branch --set-upstream-to=origin/master master
|
||||
|
||||
|
||||
Reference in New Issue
Block a user