mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-17 01:42:45 +02:00
refactor integration tests
This commit is contained in:
Jesse Duffield
@ -1 +0,0 @@
|
||||
38699899bb94dfae74e3e55cf5bd6d92e6f3292a branch 'master' of ../actual_remote
|
||||
@ -1 +0,0 @@
|
||||
7dba68a0030313e27b8dd5da2076952629485f2d
|
||||
Binary file not shown.
@ -1,7 +0,0 @@
|
||||
0000000000000000000000000000000000000000 f0e8e7922de77a5ab20b924640c8b8435bae0b0b CI <CI@example.com> 1634896911 +1100 commit (initial): myfile1
|
||||
f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 commit: myfile2
|
||||
ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI <CI@example.com> 1634896911 +1100 commit: myfile3
|
||||
80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI <CI@example.com> 1634896911 +1100 commit: myfile4
|
||||
38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 reset: moving to head^^
|
||||
ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI <CI@example.com> 1634896911 +1100 commit: myfile4 conflict
|
||||
7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI <CI@example.com> 1634896916 +1100 commit (merge): Merge branch 'master' of ../actual_remote
|
||||
@ -1,7 +0,0 @@
|
||||
0000000000000000000000000000000000000000 f0e8e7922de77a5ab20b924640c8b8435bae0b0b CI <CI@example.com> 1634896911 +1100 commit (initial): myfile1
|
||||
f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 commit: myfile2
|
||||
ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI <CI@example.com> 1634896911 +1100 commit: myfile3
|
||||
80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI <CI@example.com> 1634896911 +1100 commit: myfile4
|
||||
38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 reset: moving to head^^
|
||||
ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI <CI@example.com> 1634896911 +1100 commit: myfile4 conflict
|
||||
7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI <CI@example.com> 1634896916 +1100 commit (merge): Merge branch 'master' of ../actual_remote
|
||||
@ -1 +0,0 @@
|
||||
0000000000000000000000000000000000000000 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI <CI@example.com> 1634896911 +1100 fetch origin: storing head
|
||||
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
x��A
|
||||
�0@Q�9E���4�i"BW=F:�����D���#���ŗ�֥y�tj��'�PH�4!sL%D֞;
|
||||
QJ�趲�����2O��5�p�AB6�m�(ٕw{�� F ƻ~Jݞz���<r��9#�3"�;�1��O��ז���259�
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x��A
|
||||
�0@Ѯs��JF�c��<ƘL���")���#t�y�S5[ ������S���5d"��9`'XZ��LEҽs�i���4�c�G���7��jO@�)D��pE�ޝ��4��;��uSt4M,�
|
||||
@ -1 +0,0 @@
|
||||
720c7e2dd34822d33cb24a0a3f0f4bdabf433500
|
||||
@ -1 +0,0 @@
|
||||
38699899bb94dfae74e3e55cf5bd6d92e6f3292a
|
||||
@ -0,0 +1,8 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[remote "origin"]
|
||||
url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/./repo
|
||||
@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Q�9E��d��$�� c��`��R"����~����[(x껈�J��E�Ðp��9D�D C� ��wyu[d��Q��X<�HU��*#&ϙ���l�� �n��^��. n�S.um7 �9`����9s�c�˟ܴ�.OA� 9w
|
||||
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Ѯs��JF��J\y��L���")���#t�y�S5[ ������S���0�d"E�,�E,��3S���i���4�c�G�F{ozK՞�L�ӀA����;�9i�'w�+���5",�
|
||||
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
# pack-refs with: peeled fully-peeled sorted
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c refs/heads/master
|
||||
@ -1,11 +1,11 @@
|
||||
Merge branch 'master' of ../actual_remote
|
||||
Merge branch 'master' of ../origin
|
||||
|
||||
# Conflicts:
|
||||
# myfile4
|
||||
#
|
||||
# It looks like you may be committing a merge.
|
||||
# If this is not correct, please remove the file
|
||||
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/.git/MERGE_HEAD
|
||||
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/repo/.git/MERGE_HEAD
|
||||
# and try again.
|
||||
|
||||
|
||||
@ -0,0 +1 @@
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c branch 'master' of ../origin
|
||||
@ -0,0 +1 @@
|
||||
ref: refs/heads/master
|
||||
@ -0,0 +1 @@
|
||||
4db288af7bc797a3819441c734a4c4e7e3635296
|
||||
@ -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
|
||||
@ -0,0 +1 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
BIN
test/integration/pullMergeConflict/expected/repo/.git_keep/index
Normal file
BIN
test/integration/pullMergeConflict/expected/repo/.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
|
||||
@ -0,0 +1,7 @@
|
||||
0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI <CI@example.com> 1648349178 +1100 commit (initial): myfile1
|
||||
7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 commit: myfile2
|
||||
77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI <CI@example.com> 1648349178 +1100 commit: myfile3
|
||||
c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 commit: myfile4
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 reset: moving to HEAD~2
|
||||
77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI <CI@example.com> 1648349178 +1100 commit: myfile4 conflict
|
||||
4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI <CI@example.com> 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin
|
||||
@ -0,0 +1,7 @@
|
||||
0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI <CI@example.com> 1648349178 +1100 commit (initial): myfile1
|
||||
7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 commit: myfile2
|
||||
77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI <CI@example.com> 1648349178 +1100 commit: myfile3
|
||||
c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 commit: myfile4
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 reset: moving to HEAD~2
|
||||
77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI <CI@example.com> 1648349178 +1100 commit: myfile4 conflict
|
||||
4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI <CI@example.com> 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin
|
||||
@ -0,0 +1 @@
|
||||
0000000000000000000000000000000000000000 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 fetch origin: storing head
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Q�9E��d��$�� c��`��R"����~����[(x껈�J��E�Ðp��9D�D C� ��wyu[d��Q��X<�HU��*#&ϙ���l�� �n��^��. n�S.um7 �9`����9s�c�˟ܴ�.OA� 9w
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�@ E]�)f/HҦ�DW=F�I��i�����Gp�y�߶R�hOuw��9(`cITƄ���ҍ���7B�Ĕ�Kw_kdV� A���ܰ��걎&��X���s��c���p�������-b"i�G�xF=NU�S�;͋S�m���j��#=]
|
||||
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Ѯs��JF��J\y��L���")���#t�y�S5[ ������S���0�d"E�,�E,��3S���i���4�c�G�F{ozK՞�L�ӀA����;�9i�'w�+���5",�
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
||||
c25833e74799f64c317fe3f112f934fcc57b71f9
|
||||
@ -0,0 +1 @@
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c
|
||||
Reference in New Issue
Block a user