mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-11-06 08:59:31 +02:00
migrate more tests
This commit is contained in:
Jesse Duffield
@@ -1 +0,0 @@
|
||||
ref: refs/heads/master
|
||||
@@ -1,8 +0,0 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[remote "origin"]
|
||||
url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMerge/actual/./repo
|
||||
@@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
@@ -1,7 +0,0 @@
|
||||
# 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
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
x��A
|
||||
�0@Ѯs��JF��))��1�P�!")���#t�y�S5[ ������S����P�D��Y��X��g�ӽs���u�q��8�zK�@&�I�"z��zN��ɝ}˲*� 6%,�
|
||||
@@ -1,2 +0,0 @@
|
||||
x��A
|
||||
�0@Q�9E���$��D��z���`��R"����~���kkK����wU�*���NJ4!s��VaG>�9$4[���-�P�H$`��U�Z5W)nb�0�&e5�� �n��^����ܶ�^���,2EOQX�� ����'7�[������9%
|
||||
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.
@@ -1,2 +0,0 @@
|
||||
# pack-refs with: peeled fully-peeled sorted
|
||||
291b985e75f255f9947f064aee9e1f37af1a930d refs/heads/master
|
||||
@@ -1 +0,0 @@
|
||||
myfile4
|
||||
@@ -1 +0,0 @@
|
||||
291b985e75f255f9947f064aee9e1f37af1a930d branch 'master' of ../origin
|
||||
@@ -1 +0,0 @@
|
||||
ref: refs/heads/master
|
||||
@@ -1 +0,0 @@
|
||||
673a4237450c6ea2a27b18f1d7a3c9293c5606ea
|
||||
@@ -1,18 +0,0 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
||||
[remote "origin"]
|
||||
url = ../origin
|
||||
fetch = +refs/heads/*:refs/remotes/origin/*
|
||||
[branch "master"]
|
||||
remote = origin
|
||||
merge = refs/heads/master
|
||||
[pull]
|
||||
rebase = false
|
||||
@@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
Binary file not shown.
@@ -1,7 +0,0 @@
|
||||
# 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
|
||||
@@ -1,7 +0,0 @@
|
||||
0000000000000000000000000000000000000000 224786fb3e4a16b22b4e2b43fe01d7797491adad CI <CI@example.com> 1648348767 +1100 commit (initial): myfile1
|
||||
224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI <CI@example.com> 1648348767 +1100 commit: myfile2
|
||||
82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI <CI@example.com> 1648348767 +1100 commit: myfile3
|
||||
0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI <CI@example.com> 1648348767 +1100 commit: myfile4
|
||||
291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI <CI@example.com> 1648348767 +1100 reset: moving to HEAD~2
|
||||
82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI <CI@example.com> 1648348767 +1100 commit: myfile4
|
||||
673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI <CI@example.com> 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy.
|
||||
@@ -1,7 +0,0 @@
|
||||
0000000000000000000000000000000000000000 224786fb3e4a16b22b4e2b43fe01d7797491adad CI <CI@example.com> 1648348767 +1100 commit (initial): myfile1
|
||||
224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI <CI@example.com> 1648348767 +1100 commit: myfile2
|
||||
82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI <CI@example.com> 1648348767 +1100 commit: myfile3
|
||||
0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI <CI@example.com> 1648348767 +1100 commit: myfile4
|
||||
291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI <CI@example.com> 1648348767 +1100 reset: moving to HEAD~2
|
||||
82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI <CI@example.com> 1648348767 +1100 commit: myfile4
|
||||
673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI <CI@example.com> 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy.
|
||||
@@ -1 +0,0 @@
|
||||
0000000000000000000000000000000000000000 291b985e75f255f9947f064aee9e1f37af1a930d CI <CI@example.com> 1648348767 +1100 fetch origin: storing head
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
x��A
|
||||
�0@Ѯs��JF��))��1�P�!")���#t�y�S5[ ������S����P�D��Y��X��g�ӽs���u�q��8�zK�@&�I�"z��zN��ɝ}˲*� 6%,�
|
||||
@@ -1,2 +0,0 @@
|
||||
x��A
|
||||
�0@Q�9E���$��D��z���`��R"����~���kkK����wU�*���NJ4!s��VaG>�9$4[���-�P�H$`��U�Z5W)nb�0�&e5�� �n��^����ܶ�^���,2EOQX�� ����'7�[������9%
|
||||
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
a61316509295a5644a82e38e8bd455422fe477c5
|
||||
@@ -1 +0,0 @@
|
||||
291b985e75f255f9947f064aee9e1f37af1a930d
|
||||
@@ -1 +0,0 @@
|
||||
test1
|
||||
@@ -1 +0,0 @@
|
||||
test2
|
||||
@@ -1 +0,0 @@
|
||||
test3
|
||||
@@ -1 +0,0 @@
|
||||
test4
|
||||
@@ -1 +0,0 @@
|
||||
{"KeyEvents":[{"Timestamp":537,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1401,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
|
||||
@@ -1,42 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
set -e
|
||||
|
||||
cd $1
|
||||
|
||||
git init
|
||||
|
||||
git config user.email "CI@example.com"
|
||||
git config user.name "CI"
|
||||
|
||||
echo test1 > myfile1
|
||||
git add .
|
||||
git commit -am "myfile1"
|
||||
echo test2 > myfile2
|
||||
git add .
|
||||
git commit -am "myfile2"
|
||||
echo test3 > myfile3
|
||||
git add .
|
||||
git commit -am "myfile3"
|
||||
echo test4 > myfile4
|
||||
git add .
|
||||
git commit -am "myfile4"
|
||||
|
||||
cd ..
|
||||
git clone --bare ./repo origin
|
||||
|
||||
cd repo
|
||||
|
||||
git reset --hard HEAD~2
|
||||
|
||||
echo test4 > myfile4
|
||||
git add .
|
||||
git commit -am "myfile4"
|
||||
|
||||
git remote add origin ../origin
|
||||
git fetch origin
|
||||
git branch --set-upstream-to=origin/master master
|
||||
|
||||
git config pull.rebase false
|
||||
@@ -1 +0,0 @@
|
||||
{ "description": "When user has configured pull with merge, ensure a merge commit is created upon pull", "speed": 10 }
|
||||
@@ -1 +0,0 @@
|
||||
ref: refs/heads/master
|
||||
@@ -1,8 +0,0 @@
|
||||
[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
|
||||
@@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
@@ -1,7 +0,0 @@
|
||||
# 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
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
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.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
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.
@@ -1,2 +0,0 @@
|
||||
# pack-refs with: peeled fully-peeled sorted
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c refs/heads/master
|
||||
@@ -1,25 +0,0 @@
|
||||
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/repo/.git/MERGE_HEAD
|
||||
# and try again.
|
||||
|
||||
|
||||
# Please enter the commit message for your changes. Lines starting
|
||||
# with '#' will be ignored, and an empty message aborts the commit.
|
||||
#
|
||||
# On branch master
|
||||
# Your branch and 'origin/master' have diverged,
|
||||
# and have 1 and 2 different commits each, respectively.
|
||||
# (use "git pull" to merge the remote branch into yours)
|
||||
#
|
||||
# All conflicts fixed but you are still merging.
|
||||
#
|
||||
# Changes to be committed:
|
||||
# new file: myfile3
|
||||
# modified: myfile4
|
||||
#
|
||||
@@ -1 +0,0 @@
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c branch 'master' of ../origin
|
||||
@@ -1 +0,0 @@
|
||||
ref: refs/heads/master
|
||||
@@ -1 +0,0 @@
|
||||
4db288af7bc797a3819441c734a4c4e7e3635296
|
||||
@@ -1,18 +0,0 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
||||
[remote "origin"]
|
||||
url = ../origin
|
||||
fetch = +refs/heads/*:refs/remotes/origin/*
|
||||
[branch "master"]
|
||||
remote = origin
|
||||
merge = refs/heads/master
|
||||
[pull]
|
||||
rebase = false
|
||||
@@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
Binary file not shown.
@@ -1,7 +0,0 @@
|
||||
# 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
|
||||
@@ -1,7 +0,0 @@
|
||||
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
|
||||
@@ -1,7 +0,0 @@
|
||||
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
|
||||
@@ -1 +0,0 @@
|
||||
0000000000000000000000000000000000000000 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 fetch origin: storing head
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
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.
@@ -1,2 +0,0 @@
|
||||
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.
@@ -1,2 +0,0 @@
|
||||
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.
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
c25833e74799f64c317fe3f112f934fcc57b71f9
|
||||
@@ -1 +0,0 @@
|
||||
29c0636a86cc64292b7a6b1083c2df10de9cde6c
|
||||
@@ -1 +0,0 @@
|
||||
test1
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user