mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-06-23 00:39:13 +02:00
add tests for dealing with remotes
This commit is contained in:
1
test/integration/pull/expected/.git_keep/COMMIT_EDITMSG
Normal file
1
test/integration/pull/expected/.git_keep/COMMIT_EDITMSG
Normal file
@ -0,0 +1 @@
|
||||
myfile4
|
1
test/integration/pull/expected/.git_keep/FETCH_HEAD
Normal file
1
test/integration/pull/expected/.git_keep/FETCH_HEAD
Normal file
@ -0,0 +1 @@
|
||||
6ad6c42187d356f4eab4f004cca17863746adec1 branch 'master' of ../actual_remote
|
1
test/integration/pull/expected/.git_keep/HEAD
Normal file
1
test/integration/pull/expected/.git_keep/HEAD
Normal file
@ -0,0 +1 @@
|
||||
ref: refs/heads/master
|
1
test/integration/pull/expected/.git_keep/ORIG_HEAD
Normal file
1
test/integration/pull/expected/.git_keep/ORIG_HEAD
Normal file
@ -0,0 +1 @@
|
||||
0c0f210a4e5ff3b58e4190501c2b755695f439fa
|
16
test/integration/pull/expected/.git_keep/config
Normal file
16
test/integration/pull/expected/.git_keep/config
Normal file
@ -0,0 +1,16 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
||||
[remote "origin"]
|
||||
url = ../actual_remote
|
||||
fetch = +refs/heads/*:refs/remotes/origin/*
|
||||
[branch "master"]
|
||||
remote = origin
|
||||
merge = refs/heads/master
|
1
test/integration/pull/expected/.git_keep/description
Normal file
1
test/integration/pull/expected/.git_keep/description
Normal file
@ -0,0 +1 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
BIN
test/integration/pull/expected/.git_keep/index
Normal file
BIN
test/integration/pull/expected/.git_keep/index
Normal file
Binary file not shown.
7
test/integration/pull/expected/.git_keep/info/exclude
Normal file
7
test/integration/pull/expected/.git_keep/info/exclude
Normal file
@ -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
|
6
test/integration/pull/expected/.git_keep/logs/HEAD
Normal file
6
test/integration/pull/expected/.git_keep/logs/HEAD
Normal file
@ -0,0 +1,6 @@
|
||||
0000000000000000000000000000000000000000 003527daa0801470151d8f93140a02fc306fea00 CI <CI@example.com> 1634896904 +1100 commit (initial): myfile1
|
||||
003527daa0801470151d8f93140a02fc306fea00 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI <CI@example.com> 1634896904 +1100 commit: myfile2
|
||||
0c0f210a4e5ff3b58e4190501c2b755695f439fa 336826e035e431ac94eca7f3cb6dd3fb072f7a5a CI <CI@example.com> 1634896904 +1100 commit: myfile3
|
||||
336826e035e431ac94eca7f3cb6dd3fb072f7a5a 6ad6c42187d356f4eab4f004cca17863746adec1 CI <CI@example.com> 1634896904 +1100 commit: myfile4
|
||||
6ad6c42187d356f4eab4f004cca17863746adec1 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI <CI@example.com> 1634896904 +1100 reset: moving to head^^
|
||||
0c0f210a4e5ff3b58e4190501c2b755695f439fa 6ad6c42187d356f4eab4f004cca17863746adec1 CI <CI@example.com> 1634896905 +1100 pull --no-edit: Fast-forward
|
@ -0,0 +1,6 @@
|
||||
0000000000000000000000000000000000000000 003527daa0801470151d8f93140a02fc306fea00 CI <CI@example.com> 1634896904 +1100 commit (initial): myfile1
|
||||
003527daa0801470151d8f93140a02fc306fea00 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI <CI@example.com> 1634896904 +1100 commit: myfile2
|
||||
0c0f210a4e5ff3b58e4190501c2b755695f439fa 336826e035e431ac94eca7f3cb6dd3fb072f7a5a CI <CI@example.com> 1634896904 +1100 commit: myfile3
|
||||
336826e035e431ac94eca7f3cb6dd3fb072f7a5a 6ad6c42187d356f4eab4f004cca17863746adec1 CI <CI@example.com> 1634896904 +1100 commit: myfile4
|
||||
6ad6c42187d356f4eab4f004cca17863746adec1 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI <CI@example.com> 1634896904 +1100 reset: moving to head^^
|
||||
0c0f210a4e5ff3b58e4190501c2b755695f439fa 6ad6c42187d356f4eab4f004cca17863746adec1 CI <CI@example.com> 1634896905 +1100 pull --no-edit: Fast-forward
|
@ -0,0 +1 @@
|
||||
0000000000000000000000000000000000000000 6ad6c42187d356f4eab4f004cca17863746adec1 CI <CI@example.com> 1634896904 +1100 fetch origin: storing head
|
@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0@Ѯs��ʌN�J\y��L���")���#t�y�S5[˥���*�`�e�3���쩋T^���%�{�⧽���i����-U{I�>H@�+�;�9i�'w�+���4�,�
|
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,2 @@
|
||||
x��A
|
||||
�0@Q�9E��d2�I"BW=�4�`��R"����~�◵��[�t껪��!��#Lh��kdO��f�]_�"r�����LZ$V,�3��E_�1���u��h��x�������FJ��#{p�����'7�[������90
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
||||
6ad6c42187d356f4eab4f004cca17863746adec1
|
@ -0,0 +1 @@
|
||||
6ad6c42187d356f4eab4f004cca17863746adec1
|
1
test/integration/pull/expected/myfile1
Normal file
1
test/integration/pull/expected/myfile1
Normal file
@ -0,0 +1 @@
|
||||
test1
|
1
test/integration/pull/expected/myfile2
Normal file
1
test/integration/pull/expected/myfile2
Normal file
@ -0,0 +1 @@
|
||||
test2
|
1
test/integration/pull/expected/myfile3
Normal file
1
test/integration/pull/expected/myfile3
Normal file
@ -0,0 +1 @@
|
||||
test3
|
1
test/integration/pull/expected/myfile4
Normal file
1
test/integration/pull/expected/myfile4
Normal file
@ -0,0 +1 @@
|
||||
test4
|
Reference in New Issue
Block a user