mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-11-25 04:43:08 +03:00
add tests for dealing with remotes
This commit is contained in:
@@ -0,0 +1 @@
|
||||
myfile4
|
||||
1
test/integration/pullMerge/expected/.git_keep/FETCH_HEAD
Normal file
1
test/integration/pullMerge/expected/.git_keep/FETCH_HEAD
Normal file
@@ -0,0 +1 @@
|
||||
7f157a65ec0c8d6cffce08d6768e6733939e75a1 branch 'master' of ../actual_remote
|
||||
1
test/integration/pullMerge/expected/.git_keep/HEAD
Normal file
1
test/integration/pullMerge/expected/.git_keep/HEAD
Normal file
@@ -0,0 +1 @@
|
||||
ref: refs/heads/master
|
||||
1
test/integration/pullMerge/expected/.git_keep/ORIG_HEAD
Normal file
1
test/integration/pullMerge/expected/.git_keep/ORIG_HEAD
Normal file
@@ -0,0 +1 @@
|
||||
2a0805355a8040f9eebfa2dbf70b8bc313d6f456
|
||||
18
test/integration/pullMerge/expected/.git_keep/config
Normal file
18
test/integration/pullMerge/expected/.git_keep/config
Normal file
@@ -0,0 +1,18 @@
|
||||
[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
|
||||
[pull]
|
||||
rebase = false
|
||||
@@ -0,0 +1 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
BIN
test/integration/pullMerge/expected/.git_keep/index
Normal file
BIN
test/integration/pullMerge/expected/.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
|
||||
7
test/integration/pullMerge/expected/.git_keep/logs/HEAD
Normal file
7
test/integration/pullMerge/expected/.git_keep/logs/HEAD
Normal file
@@ -0,0 +1,7 @@
|
||||
0000000000000000000000000000000000000000 7c0bda1656e7695870ed15839643564b0a9283a8 CI <CI@example.com> 1634896907 +1100 commit (initial): myfile1
|
||||
7c0bda1656e7695870ed15839643564b0a9283a8 5529eadf398ce89032744d5f4151000f07d70124 CI <CI@example.com> 1634896907 +1100 commit: myfile2
|
||||
5529eadf398ce89032744d5f4151000f07d70124 703e85166069a42b4254af06b68dffc159ea3f24 CI <CI@example.com> 1634896907 +1100 commit: myfile3
|
||||
703e85166069a42b4254af06b68dffc159ea3f24 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI <CI@example.com> 1634896907 +1100 commit: myfile4
|
||||
7f157a65ec0c8d6cffce08d6768e6733939e75a1 5529eadf398ce89032744d5f4151000f07d70124 CI <CI@example.com> 1634896907 +1100 reset: moving to head^^
|
||||
5529eadf398ce89032744d5f4151000f07d70124 2a0805355a8040f9eebfa2dbf70b8bc313d6f456 CI <CI@example.com> 1634896907 +1100 commit: myfile4
|
||||
2a0805355a8040f9eebfa2dbf70b8bc313d6f456 b10baba2f9d877322f94f8770e2e0c8ab1db6bcc CI <CI@example.com> 1634896908 +1100 pull --no-edit: Merge made by the 'recursive' strategy.
|
||||
@@ -0,0 +1,7 @@
|
||||
0000000000000000000000000000000000000000 7c0bda1656e7695870ed15839643564b0a9283a8 CI <CI@example.com> 1634896907 +1100 commit (initial): myfile1
|
||||
7c0bda1656e7695870ed15839643564b0a9283a8 5529eadf398ce89032744d5f4151000f07d70124 CI <CI@example.com> 1634896907 +1100 commit: myfile2
|
||||
5529eadf398ce89032744d5f4151000f07d70124 703e85166069a42b4254af06b68dffc159ea3f24 CI <CI@example.com> 1634896907 +1100 commit: myfile3
|
||||
703e85166069a42b4254af06b68dffc159ea3f24 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI <CI@example.com> 1634896907 +1100 commit: myfile4
|
||||
7f157a65ec0c8d6cffce08d6768e6733939e75a1 5529eadf398ce89032744d5f4151000f07d70124 CI <CI@example.com> 1634896907 +1100 reset: moving to head^^
|
||||
5529eadf398ce89032744d5f4151000f07d70124 2a0805355a8040f9eebfa2dbf70b8bc313d6f456 CI <CI@example.com> 1634896907 +1100 commit: myfile4
|
||||
2a0805355a8040f9eebfa2dbf70b8bc313d6f456 b10baba2f9d877322f94f8770e2e0c8ab1db6bcc CI <CI@example.com> 1634896908 +1100 pull --no-edit: Merge made by the 'recursive' strategy.
|
||||
@@ -0,0 +1 @@
|
||||
0000000000000000000000000000000000000000 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI <CI@example.com> 1634896907 +1100 fetch origin: storing head
|
||||
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<01><>K
|
||||
<EFBFBD>0@]<5D><14>2<><32>$"BW=ƴ<>`<60><>R"<22><><EFBFBD><11>><1E>7<EFBFBD><37>-<2D>"<22>S<EFBFBD>U<EFBFBD>$P"W(E<>2<EFBFBD><eGT<47><54><EFBFBD><EFBFBD><EFBFBD>d6<64><36><EFBFBD>m<EFBFBD>a*<2A>Iq<> <09>`̞)<29>Haa<><61>d#<23><>Xw;<3B><>:<3A>w<EFBFBD>H۞z<DB9E><7A>v<EFBFBD>H><3E><>ɞ<01>A<EFBFBD><41><EFBFBD><EFBFBD><7F>}<7D><>Tg~j|9]
|
||||
Binary file not shown.
@@ -0,0 +1,3 @@
|
||||
x<01><>A
|
||||
<EFBFBD>0@Q<>9<EFBFBD><39><05>i<EFBFBD>I"BW=F<>L<EFBFBD><4C>!R"<22><><EFBFBD><11>~<1E><><EFBFBD><EFBFBD><0E>r<EFBFBD><72>*<2A>J<EFBFBD><4A>d<EFBFBD>QCaV
|
||||
R
|
||||
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 @@
|
||||
b10baba2f9d877322f94f8770e2e0c8ab1db6bcc
|
||||
@@ -0,0 +1 @@
|
||||
7f157a65ec0c8d6cffce08d6768e6733939e75a1
|
||||
1
test/integration/pullMerge/expected/myfile1
Normal file
1
test/integration/pullMerge/expected/myfile1
Normal file
@@ -0,0 +1 @@
|
||||
test1
|
||||
1
test/integration/pullMerge/expected/myfile2
Normal file
1
test/integration/pullMerge/expected/myfile2
Normal file
@@ -0,0 +1 @@
|
||||
test2
|
||||
1
test/integration/pullMerge/expected/myfile3
Normal file
1
test/integration/pullMerge/expected/myfile3
Normal file
@@ -0,0 +1 @@
|
||||
test3
|
||||
1
test/integration/pullMerge/expected/myfile4
Normal file
1
test/integration/pullMerge/expected/myfile4
Normal file
@@ -0,0 +1 @@
|
||||
test4
|
||||
Reference in New Issue
Block a user