go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Code Issues Releases Activity

fix integration test

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-31 19:48:34 +11:00
parent c703cd8f88
commit eb056576cf
63 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG
View File

@ -23,18 +23,16 @@ Merge branch 'develop' into other_branch
# Changes to be committed: # Changes to be committed:
# new file: cherrypicking1 # new file: cherrypicking1
# new file: cherrypicking2 # new file: cherrypicking2
# new file: cherrypicking3
# new file: cherrypicking4 # new file: cherrypicking4
# new file: cherrypicking5 # new file: cherrypicking5
# new file: cherrypicking6
# new file: cherrypicking7 # new file: cherrypicking7
# new file: cherrypicking8 # new file: cherrypicking8
# new file: cherrypicking9 # new file: cherrypicking9
# modified: directory/file # modified: directory/file
# modified: directory/file2 # modified: file3
# modified: file1
# modified: file4 # modified: file4
# modified: file5
# #
# Untracked files: # Untracked files:
# cherrypicking6 # cherrypicking3
# #

2
test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD
View File

@ -1 +1 @@
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab c62b5bc94e327ddb9b545213ff77b207ade48aba

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/index
View File

Binary file not shown.

66
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD
View File

@ -1,33 +1,33 @@
0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 commit (initial): first commit 0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 commit (initial): first commit
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 checkout: moving from master to feature/cherry-picking f37ec566036d715d6995f55dbc82a4fb3cf56f2f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 checkout: moving from master to feature/cherry-picking
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI <CI@example.com> 1643188552 +1100 commit: first commit freshman year f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI <CI@example.com> 1643618835 +1100 commit: first commit freshman year
f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI <CI@example.com> 1643188552 +1100 commit: second commit subway eat fresh 21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI <CI@example.com> 1643618835 +1100 commit: second commit subway eat fresh
34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI <CI@example.com> 1643188552 +1100 commit: third commit fresh 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI <CI@example.com> 1643618835 +1100 commit: third commit fresh
66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI <CI@example.com> 1643188552 +1100 commit: fourth commit cool 72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI <CI@example.com> 1643618835 +1100 commit: fourth commit cool
f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI <CI@example.com> 1643188552 +1100 commit: fifth commit nice 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI <CI@example.com> 1643618835 +1100 commit: fifth commit nice
4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI <CI@example.com> 1643188552 +1100 commit: sixth commit haha 4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI <CI@example.com> 1643618835 +1100 commit: sixth commit haha
93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI <CI@example.com> 1643188552 +1100 commit: seventh commit yeah 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI <CI@example.com> 1643618835 +1100 commit: seventh commit yeah
951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 commit: eighth commit woo 41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 commit: eighth commit woo
1fb30058516518ac1579a8df132b0e4dade8e51d 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 checkout: moving from feature/cherry-picking to develop d88617710499a59992caf98d6df1b5f981c58ab1 d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 checkout: moving from feature/cherry-picking to develop
1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100 commit: first commit on develop d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI <CI@example.com> 1643618835 +1100 commit: first commit on develop
40844e90419651d425c0845ec6f7c64ff63ebf03 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master fa5c5dac095b577173e47b4a0c139525eced009f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100 commit: first commit on master f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI <CI@example.com> 1643618835 +1100 commit: first commit on master
165a3cfaf6a1d3d757fb7b1c509598a395108079 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100 checkout: moving from master to develop abdaa06b758aa198cc4afb9c406c87c5690d0ca0 fa5c5dac095b577173e47b4a0c139525eced009f CI <CI@example.com> 1643618835 +1100 checkout: moving from master to develop
40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100 commit: second commit on develop fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI <CI@example.com> 1643618835 +1100 commit: second commit on develop
9c59217622ae74189d18f2992121f97dd28e966b 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master 6c590c6a21f4e6d335528b5ecf6c52993b914996 abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100 commit: second commit on master abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI <CI@example.com> 1643618835 +1100 commit: second commit on master
454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100 checkout: moving from master to develop dd401e3ee3d58b648207cee7f737364a37139bea 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI <CI@example.com> 1643618835 +1100 checkout: moving from master to develop
9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100 commit: third commit on develop 6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI <CI@example.com> 1643618835 +1100 commit: third commit on develop
ba211bf3464f9c0429483a83963c1c69e1f53d4e 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master b2afb2548f2d143fdd691058f2283b03933a1749 dd401e3ee3d58b648207cee7f737364a37139bea CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100 commit: third commit on master dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI <CI@example.com> 1643618835 +1100 commit: third commit on master
a83aac98467d005729bc9d80fe98abba47d41495 ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100 checkout: moving from master to develop 34d20faa891d1857610dce8f790a35b702ebd7ee b2afb2548f2d143fdd691058f2283b03933a1749 CI <CI@example.com> 1643618835 +1100 checkout: moving from master to develop
ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI <CI@example.com> 1643188552 +1100 commit: fourth commit on develop b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on develop
85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 34d20faa891d1857610dce8f790a35b702ebd7ee CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 commit: fourth commit on master 34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on master
cd97d8e8ca03000f761f0e041cea0b6039923e70 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 checkout: moving from master to base_branch d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 checkout: moving from master to base_branch
cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 commit: file d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 commit: file
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 checkout: moving from base_branch to other_branch c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 checkout: moving from base_branch to other_branch
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 checkout: moving from other_branch to base_branch c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 checkout: moving from other_branch to base_branch
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI <CI@example.com> 1643188552 +1100 commit: file changed c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI <CI@example.com> 1643618835 +1100 commit: file changed
06d48b81c12e9c1a3cc2704c0db337639a8cdf85 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 checkout: moving from base_branch to other_branch a51a44d96e13555215619b32065d0a22d95b8476 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 checkout: moving from base_branch to other_branch
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI <CI@example.com> 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI <CI@example.com> 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch

6
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch
View File

@ -1,3 +1,3 @@
0000000000000000000000000000000000000000 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 commit: file d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 commit: file
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI <CI@example.com> 1643188552 +1100 commit: file changed c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI <CI@example.com> 1643618835 +1100 commit: file changed

10
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop
View File

@ -1,5 +1,5 @@
0000000000000000000000000000000000000000 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100 commit: first commit on develop d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI <CI@example.com> 1643618835 +1100 commit: first commit on develop
40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100 commit: second commit on develop fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI <CI@example.com> 1643618835 +1100 commit: second commit on develop
9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100 commit: third commit on develop 6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI <CI@example.com> 1643618835 +1100 commit: third commit on develop
ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI <CI@example.com> 1643188552 +1100 commit: fourth commit on develop b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on develop

18
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking
View File

@ -1,9 +1,9 @@
0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI <CI@example.com> 1643188552 +1100 commit: first commit freshman year f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI <CI@example.com> 1643618835 +1100 commit: first commit freshman year
f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI <CI@example.com> 1643188552 +1100 commit: second commit subway eat fresh 21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI <CI@example.com> 1643618835 +1100 commit: second commit subway eat fresh
34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI <CI@example.com> 1643188552 +1100 commit: third commit fresh 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI <CI@example.com> 1643618835 +1100 commit: third commit fresh
66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI <CI@example.com> 1643188552 +1100 commit: fourth commit cool 72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI <CI@example.com> 1643618835 +1100 commit: fourth commit cool
f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI <CI@example.com> 1643188552 +1100 commit: fifth commit nice 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI <CI@example.com> 1643618835 +1100 commit: fifth commit nice
4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI <CI@example.com> 1643188552 +1100 commit: sixth commit haha 4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI <CI@example.com> 1643618835 +1100 commit: sixth commit haha
93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI <CI@example.com> 1643188552 +1100 commit: seventh commit yeah 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI <CI@example.com> 1643618835 +1100 commit: seventh commit yeah
951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 commit: eighth commit woo 41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 commit: eighth commit woo

10
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master
View File

@ -1,5 +1,5 @@
0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 commit (initial): first commit 0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 commit (initial): first commit
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100 commit: first commit on master f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI <CI@example.com> 1643618835 +1100 commit: first commit on master
165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100 commit: second commit on master abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI <CI@example.com> 1643618835 +1100 commit: second commit on master
454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100 commit: third commit on master dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI <CI@example.com> 1643618835 +1100 commit: third commit on master
a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 commit: fourth commit on master 34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on master

4
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch
View File

@ -1,2 +1,2 @@
0000000000000000000000000000000000000000 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI <CI@example.com> 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI <CI@example.com> 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079
View File

@ -1,2 +0,0 @@
x��M
�0F]��$��g"BW=�4�`���F�������{���֥����v���D� ��-�$ώE��bB��lA��.�΄̨ Yo�d�y���IȻ���������0�pƻ|�nO��������{ gc�V��SM��UY���������/+?�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05
View File

Binary file not shown.

1
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc Normal file
View File

@ -0,0 +1 @@
x��Kj1��)z�_{L0�j��j���cd��ǐ d[TA���uP��0:@��~�"��0�h�Q"$�.1��=��>��������s�eɖs-:IV�Zf ��{\�N�F�u;�%�qç���<��~�c���ɽ�{j����k���:��&w��t� �BC�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee Normal file
View File

@ -0,0 +1,3 @@
x��A
�0�a�9���t��D��z�i3�cK���-x����7m9�ߝj1���[OI�bd��8���B�:�]�=+����(�2����,Α"V�H�U���l���p����a�i�7��P�Z8#z���8U����e- ~
�'d}�}��?+

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d Normal file
View File

@ -0,0 +1,3 @@
x��K
�0@]��d���]��ɔ
ƖEoo� �}���Z�

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f
View File

@ -1,2 +0,0 @@
x��M
�0�]��$�t�"BW=�d��`��F��������ǓZʳ������A�ًu�D[�蝍.�y�q������{^�%6��b�I���qҁ�g��.(~�G�a��:���Ჽ�Ej���Ѡ�D��V���Z�WG��&�iPW(|t[}i>?�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b Normal file
View File

@ -0,0 +1,3 @@
x��]
�0}�)�]��uMAD�S���|�kK���-x_�]�en�m<������W����OV���f�l9_$��dǫ_�$�ީ�¨��q�DJI��>��ȻM�N�H�a|�#���E��N�c`�R��융���Tß��sm�*z�
�!�?�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5e/66799d4a5a3fed89757f3df445a962c9ce2d4f Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959
View File

@ -1,2 +0,0 @@
x��K
�0@]��d�L>��#�Li��#x| ^���=x�պv0�N��@�)���)��&{#�C����

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b Normal file
View File

@ -0,0 +1,2 @@
x��K
�0@]��$�� "t�cLf&�`m�<�/���<��u�`u8�&�1Q�LX�-�D+�R"&!�V��/�ՎM�t�4�\

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 Normal file
View File

@ -0,0 +1,2 @@
x��K
1D]��$�o���ct~D0�0F�����xԃ�kk�J�S�s��)�q�;6�})��@�P�GR��IKb�=�:���$��2�-GOiղ

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b
View File

@ -1,3 +0,0 @@
x��A
� E���/G'F��BV9��#)$1Sz�z�n�}�ey50������H���� &�|.ԧ̆���F��6�-��6H�TS����dy�
�2� ��;�DţMu�a��0>��m����Ȣ�]g����:���Ϲ*���?

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222
View File

@ -1,3 +0,0 @@
x��K
�0@]��$��D��z�I:!���F��-x����奵G�ݩo"�q��;���}"
h8"Ba�ɓZy�W�I�3��2�b)�Hv�G���L*^[ş^�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 Normal file
View File

@ -0,0 +1,2 @@
x��K
�0�a�9E��d��D��z��db �A������|���e����/��

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab
View File

@ -1,2 +0,0 @@
x��A
� @Ѯ=��B�Ѩ3PJ!�cԑ�& =~s�n?o�˶�s��x釪u@�P� �A+֡f'��Ř9�Ԕ�.���-�S%�"����

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 Normal file
View File

Binary file not shown.

4
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 Normal file
View File

@ -0,0 +1,4 @@
x��M
�0F��)f_(3N(���c�gDA�HZz�
�@��{�T�u��^��
�$��0��B���2b�8ڑQ�%�=�U�� &����\�E�i<I#�QȊx^u*���᩟����RY@޲��cW"Ds�穪��N���WA� �[���/@�?�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70
View File

Binary file not shown.

5
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 Normal file
View File

@ -0,0 +1,5 @@
x��K
�0@]��d�m~ "t�cL�*Sj
߂p�x^��<t����@?$?�#�.h����GF"���J�s�f�M^��s��"e
�;œ$��Ƚ�=v2g/bxoK�`��:Nw�pY�rI�܀��;
��p&B4=��������eP_P�}�� W�A�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 Normal file
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/8617710499a59992caf98d6df1b5f981c58ab1 Normal file
View File

@ -0,0 +1,3 @@
x��M
�0F]��$�L~
"BW=�t:��1�D����ۏ���R�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dd/401e3ee3d58b648207cee7f737364a37139bea Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951
View File

@ -1,2 +0,0 @@
x��A
1=�s$�dcaO���l�J���w�xk�*h]j�vr�7�䠊�P���싋��Ts�RD�yHýS���m�b��`M^��f�!�%�u��W�,�Ɖ��t�[�㆝.�D�甆�і�Z���Tǟ�)������4</U���4��?C�

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f9/c5f8e0789c2eb9a6e37ba82a5b34be739989ec
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f Normal file
View File

@ -0,0 +1,2 @@
x��M
�0F]��$�L�@D���H� ���(߂p��x�XKY: (O�1�@&[r��c���q�HR+��t�*J$��x된3h-J�>h��C�.��q��¨]�Q�W���q��'�}�K��hHtNi8#J)z����.�Ҟ~�

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch
View File

@ -1 +1 @@
06d48b81c12e9c1a3cc2704c0db337639a8cdf85 a51a44d96e13555215619b32065d0a22d95b8476

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop
View File

@ -1 +1 @@
85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking
View File

@ -1 +1 @@
1fb30058516518ac1579a8df132b0e4dade8e51d d88617710499a59992caf98d6df1b5f981c58ab1

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master
View File

@ -1 +1 @@
cd97d8e8ca03000f761f0e041cea0b6039923e70 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch
View File

@ -1 +1 @@
4c1db169d59c4345aba213cb79934f4e38222f02 d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2

2
test/integration/mergeConflictsFiltered/expected/directory/file2
View File

@ -1 +1 @@
test2 test3

4
test/integration/mergeConflictsFiltered/expected/file1
View File

@ -1,5 +1,5 @@
Here is a story that has been told throuhg the ages Here is a story that has been told throuhg the ages
once upon a time there was a dog once upon a time there was a cat
... ...
... ...
... ...
@ -60,4 +60,4 @@ once upon a time there was a dog
... ...
... ...
... ...
once upon a time there was another dog once upon a time there was another cat

2
test/integration/mergeConflictsFiltered/expected/file3
View File

@ -1 +1 @@
once upon a time there was a horse once upon a time there was a mouse

2
test/integration/mergeConflictsFiltered/expected/file5
View File

@ -1 +1 @@
once upon a time there was a mouse once upon a time there was a horse

2
test/integration/mergeConflictsFiltered/recording.json
View File

@ -1 +1 @@
{"KeyEvents":[{"Timestamp":626,"Mod":0,"Key":259,"Ch":0},{"Timestamp":930,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1065,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1202,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1818,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2234,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2929,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3474,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3739,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3890,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4401,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4714,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5681,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6003,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6226,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8394,"Mod":2,"Key":2,"Ch":2},{"Timestamp":9194,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9691,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9842,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10041,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10322,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10610,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11682,"Mod":2,"Key":2,"Ch":2},{"Timestamp":12113,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12458,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12994,"Mod":0,"Key":257,"Ch":0},{"Timestamp":13210,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13842,"Mod":2,"Key":2,"Ch":2},{"Timestamp":15075,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15290,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15890,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16778,"Mod":0,"Key":257,"Ch":0},{"Timestamp":17130,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17546,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18250,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18626,"Mod":0,"Key":257,"Ch":0},{"Timestamp":18882,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19210,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19762,"Mod":0,"Key":257,"Ch":0},{"Timestamp":20002,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20322,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20746,"Mod":0,"Key":256,"Ch":32},{"Timestamp":21138,"Mod":0,"Key":256,"Ch":32},{"Timestamp":22724,"Mod":0,"Key":27,"Ch":0},{"Timestamp":24410,"Mod":0,"Key":256,"Ch":77},{"Timestamp":25725,"Mod":0,"Key":27,"Ch":0},{"Timestamp":26017,"Mod":0,"Key":256,"Ch":109},{"Timestamp":26745,"Mod":0,"Key":13,"Ch":13},{"Timestamp":27826,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} {"KeyEvents":[{"Timestamp":682,"Mod":0,"Key":259,"Ch":0},{"Timestamp":929,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1104,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1417,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1953,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2241,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2729,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3233,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3489,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4048,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4353,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4673,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5208,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6408,"Mod":2,"Key":2,"Ch":2},{"Timestamp":7145,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7625,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7841,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8520,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8897,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9233,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9633,"Mod":2,"Key":2,"Ch":2},{"Timestamp":10016,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10393,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10881,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11137,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11473,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11809,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12056,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12354,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12921,"Mod":2,"Key":2,"Ch":2},{"Timestamp":13481,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13681,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13945,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14992,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15929,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16185,"Mod":0,"Key":257,"Ch":0},{"Timestamp":16401,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16753,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17353,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17640,"Mod":0,"Key":258,"Ch":0},{"Timestamp":17825,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18249,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18457,"Mod":0,"Key":257,"Ch":0},{"Timestamp":18673,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19593,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20641,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

2
test/integration/mergeConflictsFiltered/test.json
View File

@ -1,4 +1,4 @@
{ {
"description": "Verify that when we get merge conflicts we filter out any non-conflicted files", "description": "Verify that when we get merge conflicts we filter out any non-conflicted files",
"speed": 1 "speed": 5
} }