From fa2e7ae1e785ecc6fda180e10bb9eccf3d27587b Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 26 Jan 2022 19:45:42 +1100 Subject: [PATCH] show only merge conflict files when there are merge conflicts --- pkg/gui/files_panel.go | 15 +- pkg/gui/filetree/file_tree_view_model.go | 38 +++-- pkg/gui/filetree/file_tree_view_model_test.go | 14 ++ .../expected/.git_keep/COMMIT_EDITMSG | 11 +- .../branchRebase/expected/.git_keep/ORIG_HEAD | 2 +- .../branchRebase/expected/.git_keep/index | Bin 835 -> 835 bytes .../branchRebase/expected/.git_keep/logs/HEAD | 44 ++--- .../.git_keep/logs/refs/heads/develop | 10 +- .../expected/.git_keep/logs/refs/heads/master | 12 +- .../2e/83133d8d6b88c588de66c3ff8405501b5215b4 | Bin 0 -> 74 bytes .../36/27f93f3cc779dc2f99484fb8ffa49953e43b2f | Bin 0 -> 121 bytes .../3e/1706cdf670f5641be0715178471abfc9ed1748 | 2 + .../42/1b29bba240f23ea39e216bb0873cd4012624b5 | Bin 0 -> 120 bytes .../42/597904331c82f6d5c8c902755c8dfa5767ea95 | Bin 0 -> 160 bytes .../4d/34b8913eb0991ca63f8f7877ab8408e1511b3d | 2 - .../5b/c64a01e7b980e97f714fba45aa18f0eef726fb | Bin 156 -> 0 bytes .../5d/874a902548f753e50944827e572a7470aa9731 | Bin 0 -> 107 bytes .../69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 | Bin 0 -> 157 bytes .../70/95508e3cd0fd40572f8e711170db38ef2342d7 | Bin 0 -> 160 bytes .../72/df4fceb0be99deb091ece3f501ef80b39a876a | Bin 74 -> 0 bytes .../7f/8238e605705a3b485f653df7779e43a41f4e76 | Bin 159 -> 0 bytes .../8c/464cc13c9ad8d00604ec9b646e2b2187706287 | 2 - .../8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 | 2 + .../9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 | 3 + .../9e/c3d8f323be49b6cc9036db9299fb0ae6764440 | Bin 158 -> 0 bytes .../a8/381c9130b03aef530b60b5a4546b93dc59ae12 | 2 + .../ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d | Bin 120 -> 0 bytes .../b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 | Bin 122 -> 0 bytes .../b7/8c0e574778464b30f8b9979e8c8ec5693675f4 | 2 - .../cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f | 6 + .../ce/a4333c6fff70e6248efee2b3a414a4e11a7956 | 3 - .../e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 | Bin 160 -> 0 bytes .../e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 | Bin 0 -> 159 bytes .../f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f | Bin 158 -> 0 bytes .../f4/5c1fa29d9ae6806790e81763d978db2d957be2 | Bin 74 -> 0 bytes .../f5/067da83b48f8588edce682fd2715a575f34373 | 4 + .../f9/ad2a0d946867abbd3228fc132afef480287c27 | 2 - .../expected/.git_keep/refs/heads/develop | 2 +- .../expected/.git_keep/refs/heads/master | 2 +- .../branchRebase/expected/directory/file | 2 +- test/integration/branchRebase/expected/file1 | 2 +- test/integration/branchRebase/recording.json | 2 +- .../mergeConflictsFiltered/config/config.yml | 5 + .../expected/.git_keep/COMMIT_EDITMSG | 40 +++++ .../expected/.git_keep/FETCH_HEAD | 0 .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 1734 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 33 ++++ .../.git_keep/logs/refs/heads/base_branch | 3 + .../.git_keep/logs/refs/heads/develop | 5 + .../logs/refs/heads/feature/cherry-picking | 9 + .../expected/.git_keep/logs/refs/heads/master | 5 + .../.git_keep/logs/refs/heads/other_branch | 2 + .../06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 | Bin 0 -> 153 bytes .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 0 -> 112 bytes .../16/5a3cfaf6a1d3d757fb7b1c509598a395108079 | 2 + .../17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 | Bin 0 -> 34 bytes .../17/4a8c9444cfa700682d74059d9fa9be5749242c | Bin 0 -> 177 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 | Bin 0 -> 66 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 0 -> 50 bytes .../1f/b30058516518ac1579a8df132b0e4dade8e51d | Bin 0 -> 155 bytes .../20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 | Bin 0 -> 144 bytes .../20/8e708af0dc73a41a09e79a7198ce56aef3df05 | Bin 0 -> 381 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 0 -> 117 bytes .../22/b0fd807dd5e428c2d818aef6a2311d7c11e885 | Bin 0 -> 66 bytes .../24/6f7487e08e6330ccbec4053e701145d53f64d4 | Bin 0 -> 327 bytes .../2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 | Bin 0 -> 150 bytes .../32/d15fd4451b6693a93d6420c8af6cfc99348e71 | Bin 0 -> 80 bytes .../34/850e31f804a946d014b14443cf7387546877b0 | Bin 0 -> 164 bytes .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 0 -> 120 bytes .../36/e0ef3e52c6e29e64980c71defbab6064d2da8c | Bin 0 -> 252 bytes .../38/08a710b52a152bb73805fe274e0d877cf61800 | 2 + .../40/844e90419651d425c0845ec6f7c64ff63ebf03 | Bin 0 -> 157 bytes .../41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a | Bin 0 -> 121 bytes .../45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f | 2 + .../4a/be915d16bbc10f38b578390ff74c9ae62bf503 | Bin 0 -> 153 bytes .../4c/1db169d59c4345aba213cb79934f4e38222f02 | Bin 0 -> 201 bytes .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 + .../5d/a4d9200457542d875fe4def54ac98c16332db0 | Bin 0 -> 33 bytes .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 0 -> 86 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 0 -> 54 bytes .../61/01e935461d4cd862ae4a720846e87880d198b9 | Bin 0 -> 66 bytes .../66/340a9343a65aec523bfc57bd5a870eb4e05959 | 2 + .../78/3666de4acbb22a9efc205197667f5136118c54 | Bin 0 -> 328 bytes .../85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b | 3 + .../88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d | Bin 0 -> 66 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 0 -> 65 bytes .../90/a84fd62f8033027fab3e567a81d5ed2a6a71cd | Bin 0 -> 66 bytes .../91/65a12a95d3b2b9b8a0374de787af169b2c339e | Bin 0 -> 48 bytes .../93/d727583328b5ce8f717380d014b87bd7893222 | 3 + .../95/1a2354eb5856644b0f1db74becc04c908beaa3 | Bin 0 -> 156 bytes .../95/9d7a10da71acf97b17300b40a3b4f30903e09c | Bin 0 -> 358 bytes .../9c/59217622ae74189d18f2992121f97dd28e966b | Bin 0 -> 158 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 0 -> 54 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a8/3aac98467d005729bc9d80fe98abba47d41495 | Bin 0 -> 157 bytes .../ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab | 2 + .../af/a76754c933269d7cd45630a7184a20849dbe9c | Bin 0 -> 66 bytes .../b4/121e2d6aa156227b6541431ddfb8594904b520 | Bin 0 -> 66 bytes .../ba/211bf3464f9c0429483a83963c1c69e1f53d4e | Bin 0 -> 158 bytes .../c1/dd146476a4a37fff75b88612a718281ea83b58 | Bin 0 -> 277 bytes .../cd/97d8e8ca03000f761f0e041cea0b6039923e70 | Bin 0 -> 157 bytes .../d0/60f7226715ca55b04e91fad2b8aca01badd993 | Bin 0 -> 303 bytes .../d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 | Bin 0 -> 201 bytes .../da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 | Bin 0 -> 227 bytes .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 0 -> 50 bytes .../e4/48ae5bf6371d80ebee24a22b6df341797a6511 | Bin 0 -> 66 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 0 -> 86 bytes .../ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d | Bin 0 -> 361 bytes .../eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 | Bin 0 -> 66 bytes .../f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 | Bin 0 -> 144 bytes .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 0 -> 54 bytes .../f4/7cc13dc21c72755ff2d96d0805837dbb028951 | 2 + .../f9/c5f8e0789c2eb9a6e37ba82a5b34be739989ec | Bin 0 -> 155 bytes .../fd/31cea7e0b6e8d334280be34db8dd86cdda3007 | Bin 0 -> 352 bytes .../expected/.git_keep/refs/heads/base_branch | 1 + .../expected/.git_keep/refs/heads/develop | 1 + .../refs/heads/feature/cherry-picking | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/heads/other_branch | 1 + .../expected/cherrypicking1 | 1 + .../expected/cherrypicking2 | 1 + .../expected/cherrypicking3 | 1 + .../expected/cherrypicking4 | 1 + .../expected/cherrypicking5 | 1 + .../expected/cherrypicking6 | 1 + .../expected/cherrypicking7 | 1 + .../expected/cherrypicking8 | 1 + .../expected/cherrypicking9 | 1 + .../expected/directory/file | 1 + .../expected/directory/file2 | 1 + .../mergeConflictsFiltered/expected/file | 1 + .../mergeConflictsFiltered/expected/file1 | 63 +++++++ .../mergeConflictsFiltered/expected/file3 | 1 + .../mergeConflictsFiltered/expected/file4 | 1 + .../mergeConflictsFiltered/expected/file5 | 1 + .../mergeConflictsFiltered/recording.json | 1 + .../mergeConflictsFiltered/setup.sh | 156 ++++++++++++++++++ .../mergeConflictsFiltered/test.json | 4 + 146 files changed, 502 insertions(+), 70 deletions(-) create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/4d/34b8913eb0991ca63f8f7877ab8408e1511b3d delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/5b/c64a01e7b980e97f714fba45aa18f0eef726fb create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2 create mode 100644 test/integration/branchRebase/expected/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 delete mode 100644 test/integration/branchRebase/expected/.git_keep/objects/f9/ad2a0d946867abbd3228fc132afef480287c27 create mode 100644 test/integration/mergeConflictsFiltered/config/config.yml create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/config create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/description create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/index create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f9/c5f8e0789c2eb9a6e37ba82a5b34be739989ec create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking1 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking2 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking3 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking4 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking5 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking6 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking7 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking8 create mode 100644 test/integration/mergeConflictsFiltered/expected/cherrypicking9 create mode 100644 test/integration/mergeConflictsFiltered/expected/directory/file create mode 100644 test/integration/mergeConflictsFiltered/expected/directory/file2 create mode 100644 test/integration/mergeConflictsFiltered/expected/file create mode 100644 test/integration/mergeConflictsFiltered/expected/file1 create mode 100644 test/integration/mergeConflictsFiltered/expected/file3 create mode 100644 test/integration/mergeConflictsFiltered/expected/file4 create mode 100644 test/integration/mergeConflictsFiltered/expected/file5 create mode 100644 test/integration/mergeConflictsFiltered/recording.json create mode 100644 test/integration/mergeConflictsFiltered/setup.sh create mode 100644 test/integration/mergeConflictsFiltered/test.json diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 7b8e8d3de..d0b4d736c 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -530,7 +530,7 @@ func (gui *Gui) handleStatusFilterPressed() error { func (gui *Gui) setStatusFiltering(filter filetree.FileTreeDisplayFilter) error { state := gui.State - state.FileTreeViewModel.SetDisplayFilter(filter) + state.FileTreeViewModel.SetFilter(filter) return gui.handleRefreshFiles() } @@ -640,6 +640,19 @@ func (gui *Gui) refreshStateFiles() error { } } + // only taking over the filter if it hasn't already been set by the user. + // Though this does make it impossible for the user to actually say they want to display all if + // conflicts are currently being shown. Hmm. Worth it I reckon. If we need to add some + // extra state here to see if the user's set the filter themselves we can do that, but + // I'd prefer to maintain as little state as possible. + if conflictFileCount > 0 { + if state.FileTreeViewModel.GetFilter() == filetree.DisplayAll { + state.FileTreeViewModel.SetFilter(filetree.DisplayConflicted) + } + } else if state.FileTreeViewModel.GetFilter() == filetree.DisplayConflicted { + state.FileTreeViewModel.SetFilter(filetree.DisplayAll) + } + state.FileTreeViewModel.SetFiles(files) state.FileTreeViewModel.RWMutex.Unlock() diff --git a/pkg/gui/filetree/file_tree_view_model.go b/pkg/gui/filetree/file_tree_view_model.go index 7e8497c96..01eb751e3 100644 --- a/pkg/gui/filetree/file_tree_view_model.go +++ b/pkg/gui/filetree/file_tree_view_model.go @@ -1,6 +1,7 @@ package filetree import ( + "fmt" "sync" "github.com/jesseduffield/lazygit/pkg/commands/models" @@ -13,6 +14,8 @@ const ( DisplayAll FileTreeDisplayFilter = iota DisplayStaged DisplayUnstaged + // this shows files with merge conflicts + DisplayConflicted ) type FileTreeViewModel struct { @@ -49,29 +52,32 @@ func (self *FileTreeViewModel) ExpandToPath(path string) { func (self *FileTreeViewModel) GetFilesForDisplay() []*models.File { files := self.files - if self.filter == DisplayAll { + + switch self.filter { + case DisplayAll: return files + case DisplayStaged: + return self.FilterFiles(func(file *models.File) bool { return file.HasStagedChanges }) + case DisplayUnstaged: + return self.FilterFiles(func(file *models.File) bool { return file.HasUnstagedChanges }) + case DisplayConflicted: + return self.FilterFiles(func(file *models.File) bool { return file.HasMergeConflicts }) + default: + panic(fmt.Sprintf("Unexpected files display filter: %d", self.filter)) } +} +func (self *FileTreeViewModel) FilterFiles(test func(*models.File) bool) []*models.File { result := make([]*models.File, 0) - if self.filter == DisplayStaged { - for _, file := range files { - if file.HasStagedChanges { - result = append(result, file) - } - } - } else { - for _, file := range files { - if !file.HasStagedChanges { - result = append(result, file) - } + for _, file := range self.files { + if test(file) { + result = append(result, file) } } - return result } -func (self *FileTreeViewModel) SetDisplayFilter(filter FileTreeDisplayFilter) { +func (self *FileTreeViewModel) SetFilter(filter FileTreeDisplayFilter) { self.filter = filter self.SetTree() } @@ -147,3 +153,7 @@ func (self *FileTreeViewModel) Tree() INode { func (self *FileTreeViewModel) CollapsedPaths() CollapsedPaths { return self.collapsedPaths } + +func (self *FileTreeViewModel) GetFilter() FileTreeDisplayFilter { + return self.filter +} diff --git a/pkg/gui/filetree/file_tree_view_model_test.go b/pkg/gui/filetree/file_tree_view_model_test.go index 10c32d31d..89b8e74df 100644 --- a/pkg/gui/filetree/file_tree_view_model_test.go +++ b/pkg/gui/filetree/file_tree_view_model_test.go @@ -54,6 +54,20 @@ func TestFilterAction(t *testing.T) { {Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true}, }, }, + { + name: "filter conflicted files", + filter: DisplayConflicted, + files: []*models.File{ + {Name: "dir2/dir2/file4", ShortStatus: "DU", HasMergeConflicts: true}, + {Name: "dir2/file5", ShortStatus: "M ", HasUnstagedChanges: true}, + {Name: "dir2/file6", ShortStatus: " M", HasStagedChanges: true}, + {Name: "file1", ShortStatus: "UU", HasMergeConflicts: true, HasInlineMergeConflicts: true}, + }, + expected: []*models.File{ + {Name: "dir2/dir2/file4", ShortStatus: "DU", HasMergeConflicts: true}, + {Name: "file1", ShortStatus: "UU", HasMergeConflicts: true, HasInlineMergeConflicts: true}, + }, + }, } for _, s := range scenarios { diff --git a/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG index 8ef87ec12..42bf03720 100644 --- a/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG @@ -3,15 +3,16 @@ first commit on master # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# interactive rebase in progress; onto e23041d +# interactive rebase in progress; onto e957aaf # Last command done (1 command done): -# pick 5bc64a0 first commit on master +# pick 69f11ae first commit on master # Next commands to do (3 remaining commands): -# drop 8c464cc second commit on master -# drop 9ec3d8f third commit on master -# You are currently rebasing branch 'master' on 'e23041d'. +# drop 8d3bd1c second commit on master +# drop 3e1706c third commit on master +# You are currently rebasing branch 'master' on 'e957aaf'. # # Changes to be committed: +# modified: directory/file # modified: directory/file2 # modified: file1 # diff --git a/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD b/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD index 4c0b2873b..28cab2e49 100644 --- a/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD +++ b/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -5bc64a01e7b980e97f714fba45aa18f0eef726fb +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 diff --git a/test/integration/branchRebase/expected/.git_keep/index b/test/integration/branchRebase/expected/.git_keep/index index 7611a1fafaa6939d5d9f612beecea5e42ccc622f..12d7435870d424e61c2a979e02a8af94870c5210 100644 GIT binary patch delta 335 zcmX@ic9>1Y#WTp6fq{Vuh}jZ93MojnXRZLzlIkfB85tN@nKWm7pID-*&6ko{l$u#tA+eIO!GP=Y_oVeMn(I1$@vgJwiVomeC}wbEGe468qsSW3SeHF- TXT05^nWQJ782Hxr*z^?u&uwiF delta 353 zcmX@ic9_k?#WTp6fq{Vuh}jadKTJ1$&Cd&?85tN@*z`{CWngGr!oa}z6{to8q;B#C zCJ`M5zLd?|*K?zM1znOnmeBE93iy&9mCGHuEznFp6YqEMaBzC~s}?i#mOb(NpxF H`$sVVMmc)^ diff --git a/test/integration/branchRebase/expected/.git_keep/logs/HEAD b/test/integration/branchRebase/expected/.git_keep/logs/HEAD index 7db77f413..e4a5b4d7a 100644 --- a/test/integration/branchRebase/expected/.git_keep/logs/HEAD +++ b/test/integration/branchRebase/expected/.git_keep/logs/HEAD @@ -1,22 +1,22 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 commit (initial): first commit -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 checkout: moving from master to develop -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 commit: first commit on develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 checkout: moving from develop to master -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 commit: first commit on master -5bc64a01e7b980e97f714fba45aa18f0eef726fb f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 checkout: moving from master to develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 commit: second commit on develop -f9ad2a0d946867abbd3228fc132afef480287c27 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 checkout: moving from develop to master -5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 commit: second commit on master -8c464cc13c9ad8d00604ec9b646e2b2187706287 f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 checkout: moving from master to develop -f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 commit: third commit on develop -7f8238e605705a3b485f653df7779e43a41f4e76 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 checkout: moving from develop to master -8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 commit: third commit on master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 checkout: moving from master to develop -7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686669 +1000 commit: fourth commit on develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 checkout: moving from develop to master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686669 +1000 commit: fourth commit on master -4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686671 +1000 rebase -i (start): checkout develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686672 +1000 rebase -i (abort): updating HEAD -4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686674 +1000 rebase -i (start): checkout develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (continue): first commit on master -cea4333c6fff70e6248efee2b3a414a4e11a7956 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (finish): returning to refs/heads/master +0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from master to develop +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop +9a6521a3788b4d9e679b1709130ff8dc3f73ab18 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from develop to master +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 checkout: moving from master to develop +9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop +a8381c9130b03aef530b60b5a4546b93dc59ae12 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 checkout: moving from develop to master +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master +8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 checkout: moving from master to develop +a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop +7095508e3cd0fd40572f8e711170db38ef2342d7 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 checkout: moving from develop to master +8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master +3e1706cdf670f5641be0715178471abfc9ed1748 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 checkout: moving from master to develop +7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 checkout: moving from develop to master +3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master +f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188756 +1100 rebase -i (start): checkout develop +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188757 +1100 rebase -i (abort): updating HEAD +f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188758 +1100 rebase -i (start): checkout develop +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (continue): first commit on master +42597904331c82f6d5c8c902755c8dfa5767ea95 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop index b13e37d19..06dc78ae9 100644 --- a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 branch: Created from HEAD -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 commit: first commit on develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 commit: second commit on develop -f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 commit: third commit on develop -7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686669 +1000 commit: fourth commit on develop +0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 branch: Created from HEAD +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop +9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop +a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop +7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop diff --git a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master index 9be1c0f29..1856f13e4 100644 --- a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 commit (initial): first commit -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 commit: first commit on master -5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 commit: second commit on master -8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 commit: third commit on master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686669 +1000 commit: fourth commit on master -4d34b8913eb0991ca63f8f7877ab8408e1511b3d cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (finish): refs/heads/master onto e23041d5ff1f243faf319cc5e48e6d57384e4f37 +0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master +8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master +3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master +f5067da83b48f8588edce682fd2715a575f34373 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): refs/heads/master onto e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 b/test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 new file mode 100644 index 0000000000000000000000000000000000000000..7cc212f4ecbf69faeec76ef317216317aa8802b9 GIT binary patch literal 74 zcmV-Q0JZ;k0ZYosPf{>9Ww3z&1rJw87p{`j;u0e+TL=L2jJfO}K*7v1&CoD0RZmY( gAuY40xI`g2KQ}kCL?J&)b()Nz*@dXIp(Y_*L!;cu_CK&0aUq literal 0 HcmV?d00001 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 b/test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 new file mode 100644 index 000000000..fcb375444 --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 @@ -0,0 +1,2 @@ +xA +0a9II2cLiR#x| ^VawL 6ZP HVg.Tl*&9Re@)%Xﾴ t! GkC8:T?s՗u/SОPu`.? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 b/test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 new file mode 100644 index 0000000000000000000000000000000000000000..6ad1bf9cd75b1cd31f6c5468ced101f2724b08d1 GIT binary patch literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Z?cCQJl9^ZqXa=J9tg=>`*teS3!q`;U#de+mg_rDqLS|!0{ au>R%@`{q09r;rqw5K>@@RRI9XC`L=mVLLSd literal 0 HcmV?d00001 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 b/test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 new file mode 100644 index 0000000000000000000000000000000000000000..1c62a22417fe7847281aa92803041b707346a5e2 GIT binary patch literal 160 zcmV;R0AK%j0ey}^3c@fD06pgwdlzK0*`x`G2tD-~n{(@Krt^DXGv>o5aT)>`KV zgz3;WRbaB2QqDq*6FC)^lx)ZuW9Q1qXekh9ZyvJg(m<2%L?%+5u%MHKo-%hdatt&k z)eyNj^+sOpwrsjtYHjjtVvN9BR1;14xp@b*50XTg4IP4Ic8lrB#Akh zq`Zwfhb-tlo~^?)!*!bP{GqzN_>x+^f$}Q&=)FfcD=DQo=rJ|;PhFIy?*o1nv=u7t KM=ZYlq(6Uj9ZUZJ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 new file mode 100644 index 0000000000000000000000000000000000000000..9633a40775d6137b880c8529d1f629282e258ea7 GIT binary patch literal 107 zcmV-x0F?iD0p*a<34kyVL;da)nV>(4Gq}dp9<87~X|IUedoJJteuO~6%SXa40pmOk z3s=V0KxiuUhGtS^Y6#2)Dtol3O3%rhL5Z7_vNHN9#VFklej8i4j3TV0&U^nWeH~Kd NeFssJdjPfiP{E>uGQxEG;CGYu>tT0m`nS)3q zX4mge1k5!L~w) LN0-$X`5ixS{X|NQ literal 0 HcmV?d00001 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 b/test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 new file mode 100644 index 0000000000000000000000000000000000000000..7d14e4e29bf0883a5c0214316b7aab8b139f96da GIT binary patch literal 160 zcmV;R0AK%j0gaAH3d1lE1asCa<{k($)?x`l2>9e@Xc=RJWf`G_JU@bbAh)KeE;^Q+ zw*~{@rB!CIar8`!;MHv%Vr%28j6sNCzH1JkhijE`(l%5yegTbJ? zM48}ZirRUmLHJi&OND8M`!qlKi?(hx!EXiS OfW&X!%PGEZbwB(FR!gJ+ literal 0 HcmV?d00001 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a b/test/integration/branchRebase/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a deleted file mode 100644 index 19670ff5ad0dd0dd6e4a8ec0e9f87b3722326911..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74 zcmV-Q0JZ;k0V^p=O;s>6WiT`_Ff%bxNXyJgWsu=&HwfNnU87ZAysZ@hx}(x5Erfs@t}7 z&`Mrz4}}mj1%0)>B%43j+JkzZVynX+*u{P_yWDdK!g&=Op^cr diff --git a/test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 b/test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 deleted file mode 100644 index f968d937a..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]d3)]8A4-xTKy6m5RXH2(=g9EW1W$8AQ}J!Ystn8enѲj1 fHvj6Ku/:Cm@ \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 b/test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 new file mode 100644 index 000000000..5083d8258 --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 @@ -0,0 +1,2 @@ +xM +0F]dDz$A4-x=r-٠#ifv piA*FYWAYae3_-MA" \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440 b/test/integration/branchRebase/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440 deleted file mode 100644 index 01e70b1cc8e9cef009607e636c463b4dbbc2cfe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0gaA93c@fDMP269zq8p{G7$o9<%4kP^4h=Ns??UWXYbm7G@t z?C@k&1SAmA%-0wOqNPhn8d+sdoOIB@i;DE&79H>QDiy{F?&I{7gY)*5ODg#RNZ3=$ aDZ&}O_pZ@4G5J$>y4H`uuX0~|TQAkPU^+km diff --git a/test/integration/branchRebase/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 b/test/integration/branchRebase/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 deleted file mode 100644 index a66fe422ec93b735d0f15d78e222a67f4c298c36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0V^p=O;s>7vtTeW00M=S%%arflKi4dhNAoa=Qiw{d2hqSH;=zEzHit( zt3Aumz`)GJL?JCRC)JSQ&Sj5)>V>!ZQ!01fOu4m~Y18kybC47mGf2;R`t|-d!(FQ+ cxD3|coMGR5NBtC%0uw?COtC5e0DeqO+5!4K;s5{u diff --git a/test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 b/test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 deleted file mode 100644 index 43d870c43..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 +++ /dev/null @@ -1,2 +0,0 @@ -x -0D=+ IAI6d%R{SYفeawgGî^ЁeX+$З͠9B{ތDǘKD%IoΫBm]s}UUxNBR(+'S^5GYo (! \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f b/test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f new file mode 100644 index 000000000..0e775a5f8 --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f @@ -0,0 +1,6 @@ +xQ +@ DS +,* +FڦBw#)MRdLPw5' d􂎤)aP:;%6 +zs[h/6|ZW}7 +ձ/K(V(+'g,7c01 \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 b/test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 deleted file mode 100644 index 098dc2c53..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 +++ /dev/null @@ -1,3 +0,0 @@ -x} -0=).H/=1t )m߀en k)K%©DDaG!J*= 1lq)ZΆYȑQ iOv6&j8ue{%riZ,Em??xُ_ -%]>:? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 b/test/integration/branchRebase/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 deleted file mode 100644 index 85b62817198cff0389d0688c8e7e11df9e1e14c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0gaAJ3d0~20K4`SZ(k@rKTm~H3R&eCMxUe*V+f}7_zm;|-3~J_snz=G zpb#&8XNEK>ADE1doUO8$*qIU)$0AckGm>~w~Mjo{BoQyOS+3M^i`;0LWX%og6khIu+8Y{D7OGFk^ zP>!=yS|%&}(U;m_n&CdpPyYC_uY8NOJb(tR$T@2?T!|3HNzbXyf9fLFqxA)T8Pp9D Nzj>{@_yPcVK+76MOnm?V literal 0 HcmV?d00001 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f b/test/integration/branchRebase/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f deleted file mode 100644 index fac587698e151ded422281a2e63e7d58fc5700a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0gaA93c@fD06pgwdlw|TZFd_G5j^>fO|rp)HKj)J`4;?u*I@=G)p?#8 z5c*wP&7fFM5(kPgTF9D4j6HXXOr;ZzK|)dyif+->9t|`jW#R$HPI@Y+I+#&0Nj~J% zCFFjjEZOO+-RcULD;zJ^vwd`4?siCZJ^?ZckIWokkKTK?(QT^PpSmm4`fTv4pgthm M+wOI7UohiAG2SFd5C8xG diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2 b/test/integration/branchRebase/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2 deleted file mode 100644 index db4c3f16135fd975b2a54511bd1a527a9c7ce998..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74 zcmV-Q0JZ;k0ZYosPf{>9Ww3z&1rJw87p{`j;u0e+TL=L2jJfO}K*2OA*~}!-Ku=Fk gAuY40xI`g2KQ}kCL?J&4MĄGV;OuSWORA[[mU_.@a \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/refs/heads/develop b/test/integration/branchRebase/expected/.git_keep/refs/heads/develop index 9974cd2cd..d77f4721f 100644 --- a/test/integration/branchRebase/expected/.git_keep/refs/heads/develop +++ b/test/integration/branchRebase/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -e23041d5ff1f243faf319cc5e48e6d57384e4f37 +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/.git_keep/refs/heads/master b/test/integration/branchRebase/expected/.git_keep/refs/heads/master index f0fe9cada..567f6507a 100644 --- a/test/integration/branchRebase/expected/.git_keep/refs/heads/master +++ b/test/integration/branchRebase/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -cea4333c6fff70e6248efee2b3a414a4e11a7956 +42597904331c82f6d5c8c902755c8dfa5767ea95 diff --git a/test/integration/branchRebase/expected/directory/file b/test/integration/branchRebase/expected/directory/file index 180cf8328..df6b0d2bc 100644 --- a/test/integration/branchRebase/expected/directory/file +++ b/test/integration/branchRebase/expected/directory/file @@ -1 +1 @@ -test2 +test3 diff --git a/test/integration/branchRebase/expected/file1 b/test/integration/branchRebase/expected/file1 index dcd348507..5d874a902 100644 --- a/test/integration/branchRebase/expected/file1 +++ b/test/integration/branchRebase/expected/file1 @@ -60,4 +60,4 @@ once upon a time there was a cat ... ... ... -once upon a time there was another cat +once upon a time there was another dog diff --git a/test/integration/branchRebase/recording.json b/test/integration/branchRebase/recording.json index b88bc8ff1..c0da4c16a 100644 --- a/test/integration/branchRebase/recording.json +++ b/test/integration/branchRebase/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":468,"Mod":0,"Key":259,"Ch":0},{"Timestamp":860,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1196,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1869,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2984,"Mod":0,"Key":27,"Ch":0},{"Timestamp":4124,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4764,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5756,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6308,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6572,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7204,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7468,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7668,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8492,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8604,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8957,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9132,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9556,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10067,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10692,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10989,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11164,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11596,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11996,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12493,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12757,"Mod":0,"Key":257,"Ch":0},{"Timestamp":12900,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13245,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13380,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13788,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14516,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15604,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":617,"Mod":0,"Key":259,"Ch":0},{"Timestamp":922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1176,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1512,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2797,"Mod":0,"Key":27,"Ch":0},{"Timestamp":3632,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4760,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5105,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5376,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5721,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6186,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6401,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6592,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6840,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7105,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7612,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8160,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8680,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9080,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9464,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9808,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10372,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11249,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12088,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/config/config.yml b/test/integration/mergeConflictsFiltered/config/config.yml new file mode 100644 index 000000000..718ebf70d --- /dev/null +++ b/test/integration/mergeConflictsFiltered/config/config.yml @@ -0,0 +1,5 @@ +disableStartupPopups: true +gui: + showFileTree: false +refresher: + refreshInterval: 1 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..80977d9d1 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,40 @@ +Merge branch 'develop' into other_branch + +# Conflicts: +# directory/file +# directory/file2 +# file1 +# file3 +# file4 +# file5 +# +# 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/mergeConflictsFiltered/actual/.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 other_branch +# All conflicts fixed but you are still merging. +# +# Changes to be committed: +# new file: cherrypicking1 +# new file: cherrypicking2 +# new file: cherrypicking3 +# new file: cherrypicking4 +# new file: cherrypicking5 +# new file: cherrypicking7 +# new file: cherrypicking8 +# new file: cherrypicking9 +# modified: directory/file +# modified: directory/file2 +# modified: file1 +# modified: file4 +# modified: file5 +# +# Untracked files: +# cherrypicking6 +# diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD new file mode 100644 index 000000000..904a2e296 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..84de0034b --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/config b/test/integration/mergeConflictsFiltered/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/description b/test/integration/mergeConflictsFiltered/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/index b/test/integration/mergeConflictsFiltered/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..f455a20fa101c0b36c9902e54b9d2775029fbe06 GIT binary patch literal 1734 zcmZ?q402{*U|<4b{=|=h=}ggkj)7=~pSPYeGBB_*X|}&%U}#*zz`*zws73^cO%fSj zn!3sQ+(=sIRm9=;qN3sAjGYX8$r-6dMU@4a$=R8C>4rdc3?OruPpy&yo13gZ8EW2J zbn`l9^WT5^X`OBDXSRIngAW^j73%b&nP&tukJaw(1hBc6{H{RFdxvh`>j^KeZ!}+c zV@kuxP5KuMXWlA5c^u6=W0-ktTN5%s=CQi|SOGQfJ-T^YgyeLy7KSNRr#d>z-ro`F z$+A@e%{&vBc^p#5%|Pa{?P_=cHSYtudFz*_hnzH4n_F`w%wV~MmqN?jeRI&vGliMQ z^@Ot&WFBYtlNnI+KB1fU#A99bH*?vB*Y8voY3F`+tgK2EL^IDEW*$#?PZG#Hu9sgX zLe2YvZr+3y{@3&yjG5|J+l5s%UVW>TRd^Q7JPVk4ya#q>g3RMdunmTq2TUiZ=|yS7 z--g<&Pc#nQkXZL^k)dpj;EPr?^DJTJ@mp`12{MoOV%=}3dEe2@W0TU#R9V=J+?f;i=|)_d0@?M{-I@`2p<{J*o_>AalUk3+x_Iw*Dy~bA;z!y#_Vs zH>x=d%8%E@-}$ryH-hX8LYoK!@l{B`YDJx;N%ZBNBo+=bC5Y=b?5k?=KLkz9B{H{2nlj^1qQbb zgQ2N{A(uj5LDz>n#Y?0(pU*0saV~7#=liVixM46-FyNZ|LXEq)%VfE$@%@lbPgvBm zRwg+GxrPGEHO5PDm5@|nXkcJwV#0t*E#33@uWIUzFA<#}Zg+uBBUj7=pj!0umcc|tYp_vS|hY|}Q(T(b0D6ix2oI9E)r~Y`j%;v1e^WE2O z=Iq#U=dwpY^}<{IDU~~KrrcW0wCVTUIoQ$>$XH_r12p$yODWi59i-cYBHgBB>ps44 XSKZ{ld4@LvKJIZo$X{|hwIl!l+t^~t literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude b/test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude @@ -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 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..8d64a77dd --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD @@ -0,0 +1,33 @@ +0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 commit (initial): first commit +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 checkout: moving from master to feature/cherry-picking +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI 1643188552 +1100 commit: first commit freshman year +f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI 1643188552 +1100 commit: second commit subway eat fresh +34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI 1643188552 +1100 commit: third commit fresh +66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI 1643188552 +1100 commit: fourth commit cool +f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI 1643188552 +1100 commit: fifth commit nice +4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI 1643188552 +1100 commit: sixth commit haha +93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI 1643188552 +1100 commit: seventh commit yeah +951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 commit: eighth commit woo +1fb30058516518ac1579a8df132b0e4dade8e51d 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 checkout: moving from feature/cherry-picking to develop +1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 commit: first commit on develop +40844e90419651d425c0845ec6f7c64ff63ebf03 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 checkout: moving from develop to master +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 commit: first commit on master +165a3cfaf6a1d3d757fb7b1c509598a395108079 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 checkout: moving from master to develop +40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 commit: second commit on develop +9c59217622ae74189d18f2992121f97dd28e966b 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 checkout: moving from develop to master +165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 commit: second commit on master +454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 checkout: moving from master to develop +9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 commit: third commit on develop +ba211bf3464f9c0429483a83963c1c69e1f53d4e 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 checkout: moving from develop to master +454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 commit: third commit on master +a83aac98467d005729bc9d80fe98abba47d41495 ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 checkout: moving from master to develop +ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI 1643188552 +1100 commit: fourth commit on develop +85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 checkout: moving from develop to master +a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 commit: fourth commit on master +cd97d8e8ca03000f761f0e041cea0b6039923e70 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 checkout: moving from master to base_branch +cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 commit: file +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from base_branch to other_branch +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from other_branch to base_branch +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI 1643188552 +1100 commit: file changed +06d48b81c12e9c1a3cc2704c0db337639a8cdf85 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from base_branch to other_branch +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch new file mode 100644 index 000000000..1d7992ef4 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 branch: Created from HEAD +cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 commit: file +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI 1643188552 +1100 commit: file changed diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop new file mode 100644 index 000000000..52fde82d1 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 branch: Created from HEAD +1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 commit: first commit on develop +40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 commit: second commit on develop +9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 commit: third commit on develop +ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI 1643188552 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..a77478ee9 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 branch: Created from HEAD +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI 1643188552 +1100 commit: first commit freshman year +f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI 1643188552 +1100 commit: second commit subway eat fresh +34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI 1643188552 +1100 commit: third commit fresh +66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI 1643188552 +1100 commit: fourth commit cool +f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI 1643188552 +1100 commit: fifth commit nice +4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI 1643188552 +1100 commit: sixth commit haha +93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI 1643188552 +1100 commit: seventh commit yeah +951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..7f0b5ea9c --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 commit (initial): first commit +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 commit: first commit on master +165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 commit: second commit on master +454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 commit: third commit on master +a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..2534238d7 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 branch: Created from HEAD +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 new file mode 100644 index 0000000000000000000000000000000000000000..984eeda3bf3a66bbb65f544bcabb658b368e9008 GIT binary patch literal 153 zcmV;K0A~Mq0gcX03c@fDhGEw^MfQSZ+N6_!h|pD!F`0g`1^YvZ;PLGd+`c@ESGQ%E ztEH4K^#E)k-zgW)kv(%%lF?~Nf(##^jc-_aL}PY2uvROXp_yYM4JC9wx{`%3w$i~B ziAXV_NH+4R({|W?u=jp=;w#Jk#!a{7VX5;i#TY_kuSCw7vz}8Ge{xgiH>^&wzA%~} H{Q*7dWC}}= literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d new file mode 100644 index 0000000000000000000000000000000000000000..8d42c4c9e2f8c317030a30193aef9945f0c8afa2 GIT binary patch literal 112 zcmV-$0FVE80V^p=O;s>7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 new file mode 100644 index 000000000..56bdc0b18 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 @@ -0,0 +1,2 @@ +xM +0F]$g"BW=4`F{֥vD -$ώEbBlA.΄̨ YodyIȻ0pƻ|nO{ gcVSMUY/+? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 new file mode 100644 index 0000000000000000000000000000000000000000..25389c9d662fa3c7c7b5b9b2c4a41240d70f394f GIT binary patch literal 34 qcmbL%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkxQPJ}D5PW-r6!l;7gaJOOuWvysr0#!pe$qVY%BjQe#sxdK}}1`%t~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 new file mode 100644 index 0000000000000000000000000000000000000000..9b8af5fe783f2a13adddbc268c1af837ab15412a GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Gli0j#1aKh^<0JY{LH*` Yg_3-Q7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d new file mode 100644 index 0000000000000000000000000000000000000000..82cc46d1c332e183565fc440e79b42b0c2c43b29 GIT binary patch literal 155 zcmV;M0A&Ao0gaA93c@fD06pgwdlw{|>~0ef5qjz~l5}eYYf6de^DX!Rufq&XsmpS2 z;4B^5rV3r~A~GtalCyIu>QtO%jGag~F?vA^g~_aG(`SRon4D+Q%z;ISvYl|u9c3-W zQi(QXP05?|YIEJ7AK=^%SN)`Aedwvwx4F&m%ivwB J`2yc>J-avrOa1@= literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 new file mode 100644 index 0000000000000000000000000000000000000000..1cafb95f9172da116f05816fbf223f92099aebbf GIT binary patch literal 144 zcmV;B0B`?z0V^p=O;s>5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^REF3kHx*dILv-8YpWOTEb+SjySa$=GydlG#%N_yM3vczORPMZ) ya%(Zurr&etASp0rc)Ttqw}t(MLG|q8mCE}nPBJ?5=OHODA*8?*s{#O;Tv8UZnMM@= literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 new file mode 100644 index 0000000000000000000000000000000000000000..01e88b75d5a2d92a5b6d5d961c9207675fcb3d5e GIT binary patch literal 381 zcmV-@0fPQ`0V^p=O;s>8He)a}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKq9@mLrA&0MzO^*fbC+PR+{E2~lkv8l9Rn6SeCntp>ZQ~heYu&TzZ zZ?&=t&tg+)$)L31Z$s_XCmM%tNUZy|$WXRM@I|YM0T3vpWEQ0+m*f{!GR%FU#$DWH zvfS19e#oaMEb3V+lboQYrDf)%GQ=*qslXB*qT3$-4H^6!-tbg& zzIz?P%Og3Zr2K&Pi5^uX1;z}I*Tv+vu)i>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 new file mode 100644 index 0000000000000000000000000000000000000000..99177464395aa927a36557643ce3e4e536679578 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>ONEk*#1aKh^<0JY{LH*` Yg_3-Q4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q67HD)k0FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^Z_#006FlVrV00j?MM;EUAyyR4c(t`Xvg+zst%-mFkl8n@%RE6@y mVxT}qeo=8Mmn{U~SDKq&3RG$b0SYOpWvMy&1zZ3SiX=>?Kq37A literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 new file mode 100644 index 0000000000000000000000000000000000000000..5d4a913e6253decff32e3741ab4e1545bc1f6b4c GIT binary patch literal 164 zcmV;V09*ff0gaA93c@fD06pgwdlw|T-EfbhAOhT4^Kd?=AQNufq(CPUCoO zKq#9wn*j>vsEL`iX7Rp{RD^vv<7PXZ#sgr_9mW^}!4}bbx6*a0*`K;wOs9K+Uk1x_ Sc;ydRUhigGF76BT<3b~@I85*W literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd new file mode 100644 index 0000000000000000000000000000000000000000..e8d63bced5a790cf612ba77d98cf03e888d91233 GIT binary patch literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0y9GGs6`FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7jvWBSN{0B< C>3I79 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 new file mode 100644 index 000000000..74bc806ad --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 @@ -0,0 +1,2 @@ +xA +0E]ATzI34)ɴMK0 |>o\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 new file mode 100644 index 0000000000000000000000000000000000000000..cca824fa4253ed75c93175bfb22ebdbd4857924a GIT binary patch literal 157 zcmV;O0Al}m0gaA93c@fD06pgwdlzIk$tDp*gr540G}&OGH6=#z`4;?u*I@=G)peaa zXu?BpBA~4+-Ucri#2JGrO_D6K5syTcGn?XUwrYz_9v!Gm29X1kV+t`5`*RGrkkJ#0 z%`r<5rmW(t-)n~E;c{Jgt? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 new file mode 100644 index 0000000000000000000000000000000000000000..8854dbe4ef85613892f103fec18cf2ed390702fc GIT binary patch literal 153 zcmV;K0A~Mq0gaAJ3c@fL23_YA|6Y*1A0Q%h)ng=oztDndONrp|EqDR9!wd{>tu39j zw3mJWWIQCQfz#}v6TD4Pa!?a$$;C@=Cq3oJV$TQGPBpQs5i-QY8YN{96H1OcyJBoX zFe$|Z7Wv)h?Vw?#`!GK7$!&k(##?)k^46#rozrwxN=k9kbE@M{UDT!anSK?m3qyPX H*OEUM#T`e? literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 new file mode 100644 index 0000000000000000000000000000000000000000..5e63d0027841f9808d6162a8511b0e379e3badc2 GIT binary patch literal 201 zcmV;)05<=40gaEbYQ!)QL{s}Kw!0z_R%c6EK?s4XuE;lpl{_0CoGl}ikk5}Hq)$0B zZw98+b-i^uNB__pKxY<27B!wr9CdQa2{CDONeX;W*f<;eVb_MOljew$qa;_n`7jAv zR)=}i05%mQNifZSym-yZW}E|JVT~5t(MfhlNSTi<2aI{p&%V?~mn%JAuCMskb-&}O z)b)j2m_{e!W1>grn1{nXPIUYeAKuVDK)LBw7CO!N!oBV%x^2Bu?F-ubZ#Mh@0YX-j D!%4g3%pYvzD&lvWcY&Pr_@JZHVP-@|e008rm4L|?@ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 new file mode 100644 index 0000000000000000000000000000000000000000..27ac61738744e4923b0d928f7521dd5707074712 GIT binary patch literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 new file mode 100644 index 0000000000000000000000000000000000000000..bfb5376c67ba79deb64b9463958ebd99b0ed9f64 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 new file mode 100644 index 0000000000000000000000000000000000000000..236b6cdf4f4a62168a2e0b0b9b49cdcdbc22c808 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Lxqxz#1aKh^<0JY{LH*` Yg_3-Q#Li#x| ^=xպv0N@))&{#C ;xʅԞ<;X9"|AMY9BF}\.T\x7О9gA./k+`nZjc> \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 new file mode 100644 index 0000000000000000000000000000000000000000..c41ae5c621a9bf45b6c82cc55ae9068918c3caa0 GIT binary patch literal 328 zcmV-O0k{5m0V^p=O;s>4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6)pd#Os`!N}me}$};B8w({TNm;CV?)U>qBoK!=Gj>B{A aXr7$<mȢ]g:Ϲ*? +Y2M}OA7 \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d new file mode 100644 index 0000000000000000000000000000000000000000..d63de558bc9f6f0096d5c3091fc31b9d8b2630eb GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>BZZQT#1aKh^<0JY{LH*` Yg_3-Q4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do(7VkpVTELH%bw9K4Tg}l<-q|_n>3x$%5#1aKh^<0JY{LH*` Yg_3-QfO|qqewNj(#?=AQNufq&XnWyQ} zfU)1S#SAL;I7H??QYaci#?BHAS~-grMao)hO5WXdv0H=WYvdTjdzKuE$q*@e!HU#n ziMd8eo|&CK+c+<9I>Y{SKH6KS`_*=3o(@2L=Sd_4hAk1ITj@I0>`&c2?6tm(@ay1X KI=U}W<~}w0N=rci literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c new file mode 100644 index 0000000000000000000000000000000000000000..1befd67ac5bd6c07ba69162c2e962eb5035fcf02 GIT binary patch literal 358 zcmV-s0h#`I0V^p=O;s>8G-fa~FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm|#@^04{ye Es|G`_Y5)KL literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b new file mode 100644 index 0000000000000000000000000000000000000000..174b52052f5d21f8cff62c5d24a4906f9760d6ad GIT binary patch literal 158 zcmV;P0Ac@l0gaA93c@fD06pgwdlzIk*`yIfgr540G`m5eZAy*e^DX!Rufq&XuJin8 zV2KWGQ-vaqvZhXP3>w8bwh>2lEMpXjA&Vr3*qJqLx-?*n%z8$qbMPc=ecp-J97>l1 zmlB+g1)WK+cCQ=s16=yyrk^yglb&*&uRwtv#pu0-BN3w6=|0u;Pu)B<*G1r$L0v%f Mty5ji7avVP=I6*s&Hw-a literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 new file mode 100644 index 0000000000000000000000000000000000000000..ffc277c86c56c088175e46f1590082f30deb89cd GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsu`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 new file mode 100644 index 0000000000000000000000000000000000000000..20ba8aaf2e75e98570d4ca7eb73621bba30596a0 GIT binary patch literal 157 zcmV;O0Al}m0gaA93d0}}0DJZodoL7?uC7o@A*VcJjVlS%8d3{=egpkLufq(?+-hAr z3_70rE&_uI#3i7%(USK_WK3|{$0RO0D(uLLry LUq`IIC(b|TCx=L~ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab new file mode 100644 index 000000000..92e71009c --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab @@ -0,0 +1,2 @@ +xA + @Ѯ=BѨ3PJ!cԑ& =~sn?o˶sx釪u@P A+֡f'Ř9Ԕ.-S%" ,*#xf5Om'{~em}XG"S]͋>"94 \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c new file mode 100644 index 0000000000000000000000000000000000000000..7302ca34e9d34bcda37b5a408f6b509933d555f2 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Q-zX@#1aKh^<0JY{LH*` Yg_3-Q7VkpVTELH%bw9K4Tg}l<-q|_n>6NQqD#1aKh^<0JY{LH*` Yg_3-Qb%7 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e new file mode 100644 index 0000000000000000000000000000000000000000..b97085682a6e012ae50a6af4921f4ca6bd740d17 GIT binary patch literal 158 zcmV;P0Ac@l0gaA93d0}}0DJZodoPq-HPMAq3OVH&MmHpo#2~ix`4#$sUWXZ&nD>3H zpb0OvhyZt-Tp&!rQHV3UiJU>4ECw^#*&w440V@Ro8 zDQPd<_mc{*y5s`G2=`%p$|vmSCbyXP2T*SfdEa#!u0)8c(Kc1(PhHhzEeU=Vz>% literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 new file mode 100644 index 0000000000000000000000000000000000000000..008bb1a6567766c154b88180e8aa85b15392362c GIT binary patch literal 277 zcmV+w0qXvE0V^p=O;s>9GiER}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7i&B$I@{1}N5++{f+*JBpNKlqBcea)P7Qf_=-=L$<9cEx+E#=W+ zLV48s{^^2D0-)iO;Tz*`4D|_GP56Y zAZ3$6<+Y%rZ?(a)!gX2i{GqZx`4Vfn0U9-4Fl8__FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMIIe0T3vpWEQ0+m*f{!G9*mA&bg`d zxsaeNWA1D#|1EyWAHP9OOUukjHDu^GJm-$)$*DgcF0(o7@qG8Sn>jmn003Pvs7;ya BlW+h4 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 new file mode 100644 index 0000000000000000000000000000000000000000..198bff1ec786820e0c2f41db6e2bed90f1e103fa GIT binary patch literal 201 zcmV;)05<=40V^p=O;s>5HfJz2FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRl&pn2ozE>i&B$I@{1}N5++{f z+*JBpNKlqBcea)P7Qf_=-=L5w`4FhFfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GxD20);Yl3A3RT#{c@$&fJdI_IX+=R$(AjJdO|{I~cefBXhDEiE%A)sUg% d@SHoEC#U{+xXk9P$MfCSZszRR0RVyibtbb-a`^xN literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c new file mode 100644 index 000000000..74c919681 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c @@ -0,0 +1 @@ +x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e new file mode 100644 index 0000000000000000000000000000000000000000..3a7ee91eab601eb205b04a6e1e62c58599193222 GIT binary patch literal 50 zcmb7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 new file mode 100644 index 0000000000000000000000000000000000000000..714e20cb7eb8a76c9832939c1e2a103d78bb257d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>bA^(O#1aKh^<0JY{LH*` Yg_3-Q>!qSWM){Gv*Rgo)QVH8F=H?^FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm=IE6id6vs H4=>-(3qr6K literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 new file mode 100644 index 0000000000000000000000000000000000000000..4992422c7407bf6efc09d23127726c19cec1119d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>V}+88#1aKh^<0JY{LH*` Yg_3-Q5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0eS?hqn=r4HCq1PXDguIm6t(FP;-g-jLzWWsiXBg}3@sDtF#Y yxwV*S)9<-+kQ5j*JYE-*+rs|BpnCT4O67eOCm9|3^N@@RRI7%&rx)LLPgyG literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 new file mode 100644 index 0000000000000000000000000000000000000000..e9f9f0881a1460f9b019818b1cbd6e4f67fe70aa GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!Xx^OrLZmHY$ z>e48>^u{bF1Oq=!e$D_KOjH)OL?4_D$WcQhB`C3@@w-d!ty4(WS$F~$GB(eJLY@dQ zD9(-*B}xKEUuu)XDDT7g}M|=PP literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 new file mode 100644 index 0000000000000000000000000000000000000000..168b5c5f9141fac77b1554e5faa51680b0f39ef8 GIT binary patch literal 352 zcmV-m0iXVO0V^p=O;s?lFkmn=FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6ZbrQLc@`W;jN4S literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch new file mode 100644 index 000000000..05892d4c0 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch @@ -0,0 +1 @@ +06d48b81c12e9c1a3cc2704c0db337639a8cdf85 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop new file mode 100644 index 000000000..a563ebbae --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop @@ -0,0 +1 @@ +85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..07d05078f --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking @@ -0,0 +1 @@ +1fb30058516518ac1579a8df132b0e4dade8e51d diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..70e34863a --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +cd97d8e8ca03000f761f0e041cea0b6039923e70 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..8621c3daa --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +4c1db169d59c4345aba213cb79934f4e38222f02 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking1 b/test/integration/mergeConflictsFiltered/expected/cherrypicking1 new file mode 100644 index 000000000..6101e9354 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking1 @@ -0,0 +1 @@ +this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking2 b/test/integration/mergeConflictsFiltered/expected/cherrypicking2 new file mode 100644 index 000000000..889b0fdfe --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking2 @@ -0,0 +1 @@ +this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking3 b/test/integration/mergeConflictsFiltered/expected/cherrypicking3 new file mode 100644 index 000000000..eb90e8d7b --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking3 @@ -0,0 +1 @@ +this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking4 b/test/integration/mergeConflictsFiltered/expected/cherrypicking4 new file mode 100644 index 000000000..b4121e2d6 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking4 @@ -0,0 +1 @@ +this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking5 b/test/integration/mergeConflictsFiltered/expected/cherrypicking5 new file mode 100644 index 000000000..afa76754c --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking5 @@ -0,0 +1 @@ +this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking6 b/test/integration/mergeConflictsFiltered/expected/cherrypicking6 new file mode 100644 index 000000000..18f469bc7 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking6 @@ -0,0 +1 @@ +this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking7 b/test/integration/mergeConflictsFiltered/expected/cherrypicking7 new file mode 100644 index 000000000..e448ae5bf --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking7 @@ -0,0 +1 @@ +this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking8 b/test/integration/mergeConflictsFiltered/expected/cherrypicking8 new file mode 100644 index 000000000..90a84fd62 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking8 @@ -0,0 +1 @@ +this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking9 b/test/integration/mergeConflictsFiltered/expected/cherrypicking9 new file mode 100644 index 000000000..22b0fd807 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/cherrypicking9 @@ -0,0 +1 @@ +this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/directory/file b/test/integration/mergeConflictsFiltered/expected/directory/file new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/directory/file @@ -0,0 +1 @@ +test2 diff --git a/test/integration/mergeConflictsFiltered/expected/directory/file2 b/test/integration/mergeConflictsFiltered/expected/directory/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/directory/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/mergeConflictsFiltered/expected/file b/test/integration/mergeConflictsFiltered/expected/file new file mode 100644 index 000000000..5da4d9200 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/file @@ -0,0 +1 @@ +original1\noriginal2\noriginal3 diff --git a/test/integration/mergeConflictsFiltered/expected/file1 b/test/integration/mergeConflictsFiltered/expected/file1 new file mode 100644 index 000000000..4f80ec0c7 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/file1 @@ -0,0 +1,63 @@ +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 another dog diff --git a/test/integration/mergeConflictsFiltered/expected/file3 b/test/integration/mergeConflictsFiltered/expected/file3 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/file3 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflictsFiltered/expected/file4 b/test/integration/mergeConflictsFiltered/expected/file4 new file mode 100644 index 000000000..1b9ae5f5d --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/file4 @@ -0,0 +1 @@ +once upon a time there was a mouse diff --git a/test/integration/mergeConflictsFiltered/expected/file5 b/test/integration/mergeConflictsFiltered/expected/file5 new file mode 100644 index 000000000..1b9ae5f5d --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/file5 @@ -0,0 +1 @@ +once upon a time there was a mouse diff --git a/test/integration/mergeConflictsFiltered/recording.json b/test/integration/mergeConflictsFiltered/recording.json new file mode 100644 index 000000000..2a7ab1ab3 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/recording.json @@ -0,0 +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}]} \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/setup.sh b/test/integration/mergeConflictsFiltered/setup.sh new file mode 100644 index 000000000..63c51ded4 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/setup.sh @@ -0,0 +1,156 @@ +#!/bin/sh + +set -e + +cd $1 + +git init +git config user.email "CI@example.com" +git config user.name "CI" + + +function add_spacing { + for i in {1..60} + do + echo "..." >> $1 + done +} + +mkdir directory +echo "test1" > directory/file +echo "test1" > directory/file2 + + +echo "Here is a story that has been told throuhg the ages" >> file1 + +git add file1 +git add directory +git commit -m "first commit" + +git checkout -b feature/cherry-picking + +echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 +echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 + +git add . + +git commit -am "first commit freshman year" + +echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 + +git add . + +git commit -am "second commit subway eat fresh" + +echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 + +git add . + +git commit -am "third commit fresh" + +echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 + +git add . + +git commit -am "fourth commit cool" + +echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 + +git add . + +git commit -am "fifth commit nice" + +echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 + +git add . + +git commit -am "sixth commit haha" + +echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 + +git add . + +git commit -am "seventh commit yeah" + +echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 + +git add . + +git commit -am "eighth commit woo" + + +git checkout -b develop +echo "once upon a time there was a dog" >> file1 +add_spacing file1 +echo "once upon a time there was another dog" >> file1 +git add file1 +echo "test2" > directory/file +echo "test2" > directory/file2 +git add directory +git commit -m "first commit on develop" + + +git checkout master +echo "once upon a time there was a cat" >> file1 +add_spacing file1 +echo "once upon a time there was another cat" >> file1 +git add file1 +echo "test3" > directory/file +echo "test3" > directory/file2 +git add directory +git commit -m "first commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file3 +git add file3 +git commit -m "second commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file3 +git add file3 +git commit -m "second commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file4 +git add file4 +git commit -m "third commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file4 +git add file4 +git commit -m "third commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file5 +git add file5 +git commit -m "fourth commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file5 +git add file5 +git commit -m "fourth commit on master" + + +# this is for the autostash feature + +git checkout -b base_branch + +echo "original1\noriginal2\noriginal3" > file +git add file +git commit -m "file" + +git checkout -b other_branch + +git checkout base_branch + +echo "new1\noriginal2\noriginal3" > file +git add file +git commit -m "file changed" + +git checkout other_branch diff --git a/test/integration/mergeConflictsFiltered/test.json b/test/integration/mergeConflictsFiltered/test.json new file mode 100644 index 000000000..7d6d3b9ca --- /dev/null +++ b/test/integration/mergeConflictsFiltered/test.json @@ -0,0 +1,4 @@ +{ + "description": "Verify that when we get merge conflicts we filter out any non-conflicted files", + "speed": 20 +}