From 1034962c7edad578427d056b7421c9195c29a457 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Feb 2023 22:25:18 +1100 Subject: [PATCH] migrate more tests --- pkg/integration/components/actions.go | 14 +++ pkg/integration/tests/branch/rebase.go | 10 +- .../tests/branch/rebase_and_drop.go | 10 +- .../cherry_pick/cherry_pick_conflicts.go | 10 +- pkg/integration/tests/file/discard_changes.go | 5 +- .../swap_in_rebase_with_conflict.go | 22 +--- pkg/integration/tests/sync/pull_merge.go | 53 +++++++++ .../tests/sync/pull_merge_conflict.go | 84 +++++++++++++++ pkg/integration/tests/sync/pull_rebase.go | 52 +++++++++ .../tests/sync/pull_rebase_conflict.go | 83 ++++++++++++++ .../sync/pull_rebase_interactive_conflict.go | 95 ++++++++++++++++ .../pull_rebase_interactive_conflict_drop.go | 101 ++++++++++++++++++ pkg/integration/tests/tests_gen.go | 6 ++ .../pullMerge/expected/origin/HEAD | 1 - .../pullMerge/expected/origin/config | 8 -- .../pullMerge/expected/origin/description | 1 - .../pullMerge/expected/origin/info/exclude | 7 -- .../0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e | Bin 149 -> 0 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../22/4786fb3e4a16b22b4e2b43fe01d7797491adad | 2 - .../29/1b985e75f255f9947f064aee9e1f37af1a930d | 2 - .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../82/422401226cbf89b60b7ba3c6d4fa74781250c9 | Bin 150 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../pullMerge/expected/origin/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../pullMerge/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../pullMerge/expected/repo/.git_keep/config | 18 ---- .../expected/repo/.git_keep/description | 1 - .../pullMerge/expected/repo/.git_keep/index | Bin 353 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 7 -- .../repo/.git_keep/logs/refs/heads/master | 7 -- .../.git_keep/logs/refs/remotes/origin/master | 1 - .../0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e | Bin 149 -> 0 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../22/4786fb3e4a16b22b4e2b43fe01d7797491adad | 2 - .../29/1b985e75f255f9947f064aee9e1f37af1a930d | 2 - .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea | Bin 149 -> 0 bytes .../82/422401226cbf89b60b7ba3c6d4fa74781250c9 | Bin 150 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a6/1316509295a5644a82e38e8bd455422fe477c5 | Bin 200 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 103 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../pullMerge/expected/repo/myfile1 | 1 - .../pullMerge/expected/repo/myfile2 | 1 - .../pullMerge/expected/repo/myfile3 | 1 - .../pullMerge/expected/repo/myfile4 | 1 - test/integration/pullMerge/recording.json | 1 - test/integration/pullMerge/setup.sh | 42 -------- test/integration/pullMerge/test.json | 1 - .../pullMergeConflict/expected/origin/HEAD | 1 - .../pullMergeConflict/expected/origin/config | 8 -- .../expected/origin/description | 1 - .../expected/origin/info/exclude | 7 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../29/c0636a86cc64292b7a6b1083c2df10de9cde6c | 2 - .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../77/a75278eb08101403d727a8ecaad724f5d9dc78 | Bin 150 -> 0 bytes .../7c/201cb45dc62900f5f42281c1235219df5d0388 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../c7/180f424ee6b59241eecffedcfa4472a86d927d | Bin 150 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/origin/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 25 ----- .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 18 ---- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 425 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 7 -- .../repo/.git_keep/logs/refs/heads/master | 7 -- .../.git_keep/logs/refs/remotes/origin/master | 1 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../29/c0636a86cc64292b7a6b1083c2df10de9cde6c | 2 - .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../4d/b288af7bc797a3819441c734a4c4e7e3635296 | 2 - .../77/a75278eb08101403d727a8ecaad724f5d9dc78 | Bin 150 -> 0 bytes .../7c/201cb45dc62900f5f42281c1235219df5d0388 | 2 - .../7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 | Bin 86 -> 0 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 24 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 103 -> 0 bytes .../c2/5833e74799f64c317fe3f112f934fcc57b71f9 | Bin 199 -> 0 bytes .../c7/180f424ee6b59241eecffedcfa4472a86d927d | Bin 150 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../pullMergeConflict/expected/repo/myfile1 | 1 - .../pullMergeConflict/expected/repo/myfile2 | 1 - .../pullMergeConflict/expected/repo/myfile3 | 1 - .../pullMergeConflict/expected/repo/myfile4 | 1 - .../pullMergeConflict/recording.json | 1 - test/integration/pullMergeConflict/setup.sh | 42 -------- test/integration/pullMergeConflict/test.json | 1 - .../pullRebase/expected/origin/HEAD | 1 - .../pullRebase/expected/origin/config | 8 -- .../pullRebase/expected/origin/description | 1 - .../pullRebase/expected/origin/info/exclude | 7 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d | 2 - .../84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 | Bin 150 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 | Bin 149 -> 0 bytes .../f2/b972db67c4667ac1896df3556a2cb2422bef8a | Bin 148 -> 0 bytes .../pullRebase/expected/origin/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../pullRebase/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../pullRebase/expected/repo/.git_keep/config | 18 ---- .../expected/repo/.git_keep/description | 1 - .../pullRebase/expected/repo/.git_keep/index | Bin 425 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 9 -- .../repo/.git_keep/logs/refs/heads/master | 7 -- .../.git_keep/logs/refs/remotes/origin/master | 1 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../25/b115c8ff09bf59b023af22277ea140b2833110 | Bin 148 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d | 2 - .../84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 | Bin 150 -> 0 bytes .../92/c2dd111eeb7daf4a0e30faff73b9441103805d | Bin 103 -> 0 bytes .../98/fea3de076a474cabfac7130669625879051d43 | Bin 134 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../ef/833c09ff39663448dd9582e3d6ac1fa777fb4f | Bin 153 -> 0 bytes .../f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 | Bin 149 -> 0 bytes .../f2/b972db67c4667ac1896df3556a2cb2422bef8a | Bin 148 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../pullRebase/expected/repo/myfile1 | 1 - .../pullRebase/expected/repo/myfile2 | 1 - .../pullRebase/expected/repo/myfile3 | 1 - .../pullRebase/expected/repo/myfile4 | 1 - .../pullRebase/expected/repo/myfile5 | 1 - test/integration/pullRebase/recording.json | 1 - test/integration/pullRebase/setup.sh | 42 -------- test/integration/pullRebase/test.json | 1 - .../pullRebaseConflict/expected/origin/HEAD | 1 - .../pullRebaseConflict/expected/origin/config | 8 -- .../expected/origin/description | 1 - .../expected/origin/info/exclude | 7 -- .../00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b | 2 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../30/8a85a7f740d42925175560337196f952ac6cf6 | Bin 150 -> 0 bytes .../70/2648e6efd5f8c60f5fe57e152850a5de756978 | Bin 148 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 | Bin 149 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/origin/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 18 ---- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 425 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 9 -- .../repo/.git_keep/logs/refs/heads/master | 7 -- .../.git_keep/logs/refs/remotes/origin/master | 1 - .../00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b | 2 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../30/8a85a7f740d42925175560337196f952ac6cf6 | Bin 150 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../70/2648e6efd5f8c60f5fe57e152850a5de756978 | Bin 148 -> 0 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 24 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 | Bin 149 -> 0 bytes .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 103 -> 0 bytes .../b2/da3d615a1805f094849247add77d09aee06451 | Bin 128 -> 0 bytes .../bd/d975a23140e915dd46a1a16575c71bcad754ca | 3 - .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../d4/50cc8f4e691e3043aac25ae71f0f1a3217368f | 2 - .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e6/1e2c991de853082420fd27fd983098afd4c0c8 | Bin 56 -> 0 bytes .../e6/9912eb1649ce8dbb33678796cec3e89da3675d | Bin 52 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../pullRebaseConflict/expected/repo/myfile1 | 1 - .../pullRebaseConflict/expected/repo/myfile2 | 1 - .../pullRebaseConflict/expected/repo/myfile3 | 1 - .../pullRebaseConflict/expected/repo/myfile4 | 1 - .../pullRebaseConflict/recording.json | 1 - test/integration/pullRebaseConflict/setup.sh | 42 -------- test/integration/pullRebaseConflict/test.json | 1 - .../expected/origin/HEAD | 1 - .../expected/origin/config | 8 -- .../expected/origin/description | 1 - .../expected/origin/info/exclude | 7 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../52/137603da2dccb618dfa0953d1b7df8c0255959 | Bin 150 -> 0 bytes .../7c/0506ec2cd7852818e3e597619ff64af83770c6 | 3 - .../91/d2303b08e6765e0ec38c401ecbab0cbb126dca | Bin 150 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 | 3 - .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/origin/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 16 --- .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 18 ---- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 550 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 15 --- .../repo/.git_keep/logs/refs/heads/master | 10 -- .../.git_keep/logs/refs/remotes/origin/master | 1 - .../00/a0b67048be84a6aeaa50b27ad90ab567d65837 | Bin 129 -> 0 bytes .../03/5fa6a8b921a1d593845c5ce81434b92cc0eccb | Bin 67 -> 0 bytes .../09/f87d11c514ba0a54e43193aaf9067174e2315e | Bin 146 -> 0 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../24/21815f8570a34d9f8c8991df1005150ed3ae99 | Bin 160 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 | Bin 144 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../41/6178fd7462af72f4357dda1241fc66063e467b | Bin 148 -> 0 bytes .../52/137603da2dccb618dfa0953d1b7df8c0255959 | Bin 150 -> 0 bytes .../5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 | 2 - .../5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 | Bin 138 -> 0 bytes .../66/d3639353f039f2b87ea3e0dd3db13a5415c6df | Bin 157 -> 0 bytes .../7c/0506ec2cd7852818e3e597619ff64af83770c6 | 3 - .../8c/fc761d2799512553e491f7ceb3564a5e994999 | Bin 134 -> 0 bytes .../91/d2303b08e6765e0ec38c401ecbab0cbb126dca | Bin 150 -> 0 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 24 -> 0 bytes .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 | Bin 20 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 103 -> 0 bytes .../b2/da3d615a1805f094849247add77d09aee06451 | Bin 128 -> 0 bytes .../d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 | Bin 145 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 | 3 - .../d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e | Bin 163 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd | Bin 156 -> 0 bytes .../f0/bbe52a52883609acdb825c8af32b4b3ccb0607 | Bin 154 -> 0 bytes .../ff/0d57cafe9d745264b23450e9268cdb5ddc4edc | 2 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../expected/repo/myfile1 | 1 - .../expected/repo/myfile2 | 1 - .../expected/repo/myfile3 | 1 - .../expected/repo/myfile4 | 1 - .../expected/repo/myfile5 | 1 - .../expected/repo/myfile6 | 1 - .../expected/repo/myfile7 | 1 - .../pullRebaseInteractive/recording.json | 1 - .../pullRebaseInteractive/setup.sh | 54 ---------- .../pullRebaseInteractive/test.json | 1 - .../expected/origin/HEAD | 1 - .../expected/origin/config | 8 -- .../expected/origin/description | 1 - .../expected/origin/info/exclude | 7 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../6e/44f128bc1b25454eeb074e40dd15d02eff5c87 | 3 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../a8/88f490faa49a665557b35171f4ce0896414ea2 | 2 - .../ce/137eabb7b8df81d4818ac8a16892b1f7327219 | 3 - .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../fe/fea9e2c324080a61d03142554b81e410e9c87f | 2 - .../expected/origin/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 16 --- .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 18 ---- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 550 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 14 --- .../repo/.git_keep/logs/refs/heads/master | 10 -- .../.git_keep/logs/refs/remotes/origin/master | 1 - .../00/a0b67048be84a6aeaa50b27ad90ab567d65837 | Bin 129 -> 0 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../26/02a2a5727666c205fef7f152786e1edb1c5d4b | Bin 160 -> 0 bytes .../28/1c7e805fd7bf133611e701ef01f0a4f362f232 | Bin 158 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../32/2d2d5205fe70df6899f8d58474941de4798aab | Bin 67 -> 0 bytes .../3c/2846a93bb9c2815e3218ac3c906da26d159068 | Bin 145 -> 0 bytes .../5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 | Bin 138 -> 0 bytes .../62/26d76652e77aba63c55f4f48344304f4f75879 | 4 - .../67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 | Bin 144 -> 0 bytes .../6b/a64def9b38eb7bcf5aa1a6c513c490967062ad | Bin 155 -> 0 bytes .../6e/44f128bc1b25454eeb074e40dd15d02eff5c87 | 3 - .../72/da3b902dcd9e99b21bdc36891e028b8dbfb219 | Bin 147 -> 0 bytes .../8c/fc761d2799512553e491f7ceb3564a5e994999 | Bin 134 -> 0 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 24 -> 0 bytes .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 | Bin 20 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../a8/88f490faa49a665557b35171f4ce0896414ea2 | 2 - .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 103 -> 0 bytes .../b2/da3d615a1805f094849247add77d09aee06451 | Bin 128 -> 0 bytes .../ce/137eabb7b8df81d4818ac8a16892b1f7327219 | 3 - .../d1/3fd4cd73174c7048108d2dc8d277a8e013d1e4 | 3 - .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../f0/bbe52a52883609acdb825c8af32b4b3ccb0607 | Bin 154 -> 0 bytes .../fe/fea9e2c324080a61d03142554b81e410e9c87f | 2 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../expected/repo/myfile1 | 1 - .../expected/repo/myfile2 | 1 - .../expected/repo/myfile3 | 1 - .../expected/repo/myfile4 | 1 - .../expected/repo/myfile5 | 1 - .../expected/repo/myfile7 | 1 - .../recording.json | 1 - .../pullRebaseInteractiveWithDrop/setup.sh | 54 ---------- .../pullRebaseInteractiveWithDrop/test.json | 1 - 369 files changed, 499 insertions(+), 913 deletions(-) create mode 100644 pkg/integration/tests/sync/pull_merge.go create mode 100644 pkg/integration/tests/sync/pull_merge_conflict.go create mode 100644 pkg/integration/tests/sync/pull_rebase.go create mode 100644 pkg/integration/tests/sync/pull_rebase_conflict.go create mode 100644 pkg/integration/tests/sync/pull_rebase_interactive_conflict.go create mode 100644 pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go delete mode 100644 test/integration/pullMerge/expected/origin/HEAD delete mode 100644 test/integration/pullMerge/expected/origin/config delete mode 100644 test/integration/pullMerge/expected/origin/description delete mode 100644 test/integration/pullMerge/expected/origin/info/exclude delete mode 100644 test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e delete mode 100644 test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad delete mode 100644 test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d delete mode 100644 test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 delete mode 100644 test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullMerge/expected/origin/packed-refs delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/config delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/description delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/index delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/pullMerge/expected/repo/myfile1 delete mode 100644 test/integration/pullMerge/expected/repo/myfile2 delete mode 100644 test/integration/pullMerge/expected/repo/myfile3 delete mode 100644 test/integration/pullMerge/expected/repo/myfile4 delete mode 100644 test/integration/pullMerge/recording.json delete mode 100644 test/integration/pullMerge/setup.sh delete mode 100644 test/integration/pullMerge/test.json delete mode 100644 test/integration/pullMergeConflict/expected/origin/HEAD delete mode 100644 test/integration/pullMergeConflict/expected/origin/config delete mode 100644 test/integration/pullMergeConflict/expected/origin/description delete mode 100644 test/integration/pullMergeConflict/expected/origin/info/exclude delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullMergeConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullMergeConflict/expected/origin/packed-refs delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/config delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/description delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/index delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c2/5833e74799f64c317fe3f112f934fcc57b71f9 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/pullMergeConflict/expected/repo/myfile1 delete mode 100644 test/integration/pullMergeConflict/expected/repo/myfile2 delete mode 100644 test/integration/pullMergeConflict/expected/repo/myfile3 delete mode 100644 test/integration/pullMergeConflict/expected/repo/myfile4 delete mode 100644 test/integration/pullMergeConflict/recording.json delete mode 100644 test/integration/pullMergeConflict/setup.sh delete mode 100644 test/integration/pullMergeConflict/test.json delete mode 100644 test/integration/pullRebase/expected/origin/HEAD delete mode 100644 test/integration/pullRebase/expected/origin/config delete mode 100644 test/integration/pullRebase/expected/origin/description delete mode 100644 test/integration/pullRebase/expected/origin/info/exclude delete mode 100644 test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebase/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d delete mode 100644 test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 delete mode 100644 test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 delete mode 100644 test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a delete mode 100644 test/integration/pullRebase/expected/origin/packed-refs delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/config delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/description delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/index delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/pullRebase/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/pullRebase/expected/repo/myfile1 delete mode 100644 test/integration/pullRebase/expected/repo/myfile2 delete mode 100644 test/integration/pullRebase/expected/repo/myfile3 delete mode 100644 test/integration/pullRebase/expected/repo/myfile4 delete mode 100644 test/integration/pullRebase/expected/repo/myfile5 delete mode 100644 test/integration/pullRebase/recording.json delete mode 100644 test/integration/pullRebase/setup.sh delete mode 100644 test/integration/pullRebase/test.json delete mode 100644 test/integration/pullRebaseConflict/expected/origin/HEAD delete mode 100644 test/integration/pullRebaseConflict/expected/origin/config delete mode 100644 test/integration/pullRebaseConflict/expected/origin/description delete mode 100644 test/integration/pullRebaseConflict/expected/origin/info/exclude delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebaseConflict/expected/origin/packed-refs delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/config delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/description delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/index delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/pullRebaseConflict/expected/repo/myfile1 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/myfile2 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/myfile3 delete mode 100644 test/integration/pullRebaseConflict/expected/repo/myfile4 delete mode 100644 test/integration/pullRebaseConflict/recording.json delete mode 100644 test/integration/pullRebaseConflict/setup.sh delete mode 100644 test/integration/pullRebaseConflict/test.json delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/HEAD delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/config delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/description delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/info/exclude delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebaseInteractive/expected/origin/packed-refs delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/config delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/description delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/index delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/09/f87d11c514ba0a54e43193aaf9067174e2315e delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/myfile1 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/myfile2 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/myfile3 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/myfile4 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/myfile5 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/myfile6 delete mode 100644 test/integration/pullRebaseInteractive/expected/repo/myfile7 delete mode 100644 test/integration/pullRebaseInteractive/recording.json delete mode 100644 test/integration/pullRebaseInteractive/setup.sh delete mode 100644 test/integration/pullRebaseInteractive/test.json delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/HEAD delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/config delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/description delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/info/exclude delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/origin/packed-refs delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/config delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/description delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/index delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6b/a64def9b38eb7bcf5aa1a6c513c490967062ad delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/72/da3b902dcd9e99b21bdc36891e028b8dbfb219 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d1/3fd4cd73174c7048108d2dc8d277a8e013d1e4 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/recording.json delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/setup.sh delete mode 100644 test/integration/pullRebaseInteractiveWithDrop/test.json diff --git a/pkg/integration/components/actions.go b/pkg/integration/components/actions.go index fb4114890..c599f3697 100644 --- a/pkg/integration/components/actions.go +++ b/pkg/integration/components/actions.go @@ -17,3 +17,17 @@ func (self *Actions) ContinueMerge() { func (self *Actions) ContinueRebase() { self.ContinueMerge() } + +func (self *Actions) AcknowledgeConflicts() { + self.t.ExpectPopup().Confirmation(). + Title(Equals("Auto-merge failed")). + Content(Contains("Conflicts!")). + Confirm() +} + +func (self *Actions) ContinueOnConflictsResolved() { + self.t.ExpectPopup().Confirmation(). + Title(Equals("continue")). + Content(Contains("all merge conflicts resolved. Continue?")). + Confirm() +} diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index e59aa8cb2..211dca839 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -35,10 +35,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")). Confirm() - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -51,10 +48,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Information().Content(Contains("rebasing")) - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() + t.Actions().ContinueOnConflictsResolved() t.Views().Information().Content(DoesNotContain("rebasing")) diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index 5f5341d66..04c2246ab 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -43,10 +43,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Information().Content(Contains("rebasing")) - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() + t.Actions().AcknowledgeConflicts() t.Views().Files().IsFocused(). SelectedLine(MatchesRegexp("UU.*file")) @@ -78,10 +75,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). PressPrimaryAction() - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() + t.Actions().ContinueOnConflictsResolved() t.Views().Information().Content(DoesNotContain("rebasing")) diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index eaf9862d6..3e82de065 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -52,10 +52,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). Confirm() - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -68,10 +65,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). PressPrimaryAction() - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() + t.Actions().ContinueOnConflictsResolved() t.Views().Files().IsEmpty() diff --git a/pkg/integration/tests/file/discard_changes.go b/pkg/integration/tests/file/discard_changes.go index f3fc11a01..7a05f4466 100644 --- a/pkg/integration/tests/file/discard_changes.go +++ b/pkg/integration/tests/file/discard_changes.go @@ -99,10 +99,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ {status: "DU", label: "deleted-us.txt", menuTitle: "deleted-us.txt"}, }) - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Cancel() + t.Actions().ContinueOnConflictsResolved() discardOneByOne([]statusFile{ {status: "MD", label: "change-delete.txt", menuTitle: "change-delete.txt"}, diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go index e177dd0cb..96b490a7f 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go @@ -49,21 +49,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ }) func handleConflictsFromSwap(t *TestDriver) { - continueMerge := func() { - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() - } - - acceptConflicts := func() { - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() - } - - acceptConflicts() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -84,9 +70,9 @@ func handleConflictsFromSwap(t *TestDriver) { SelectNextItem(). PressPrimaryAction() // pick "three" - continueMerge() + t.Actions().ContinueOnConflictsResolved() - acceptConflicts() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -107,7 +93,7 @@ func handleConflictsFromSwap(t *TestDriver) { SelectNextItem(). PressPrimaryAction() // pick "two" - continueMerge() + t.Actions().ContinueOnConflictsResolved() t.Views().Commits(). Focus(). diff --git a/pkg/integration/tests/sync/pull_merge.go b/pkg/integration/tests/sync/pull_merge.go new file mode 100644 index 000000000..86f828570 --- /dev/null +++ b/pkg/integration/tests/sync/pull_merge.go @@ -0,0 +1,53 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullMerge = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a merge strategy", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.EmptyCommit("four") + + shell.SetConfig("pull.rebase", "false") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Views().Status().Content(Contains("↑2 repo → master")) + + t.Views().Commits(). + Lines( + Contains("Merge branch 'master' of ../origin"), + Contains("three"), + Contains("two"), + Contains("four"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_merge_conflict.go b/pkg/integration/tests/sync/pull_merge_conflict.go new file mode 100644 index 000000000..447c11135 --- /dev/null +++ b/pkg/integration/tests/sync/pull_merge_conflict.go @@ -0,0 +1,84 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullMergeConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a merge strategy, where a conflict occurs", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + + shell.SetConfig("pull.rebase", "false") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content4"), + Contains("======="), + Contains("content2"), + Contains(">>>>>>>"), + ). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑2 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("Merge branch 'master' of ../origin").IsSelected(), + Contains("three"), + Contains("two"), + Contains("four"), + Contains("one"), + ) + + t.Views().Main(). + Content( + Contains("- content4"). + Contains(" -content2"). + Contains("++content4"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase.go b/pkg/integration/tests/sync/pull_rebase.go new file mode 100644 index 000000000..ca4c851d6 --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase.go @@ -0,0 +1,52 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebase = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a rebase strategy", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.EmptyCommit("four") + + shell.SetConfig("pull.rebase", "true") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Commits(). + Lines( + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase_conflict.go b/pkg/integration/tests/sync/pull_rebase_conflict.go new file mode 100644 index 000000000..4ea419a74 --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase_conflict.go @@ -0,0 +1,83 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebaseConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a rebase strategy, where a conflict occurs", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + + shell.SetConfig("pull.rebase", "true") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content2"), + Contains("======="), + Contains("content4"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Main(). + Content( + Contains("-content2"). + Contains("+content4"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go new file mode 100644 index 000000000..da45f70ed --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go @@ -0,0 +1,95 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with an interactive rebase strategy, where a conflict occurs", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + shell.EmptyCommit("five") + + shell.SetConfig("pull.rebase", "interactive") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("five"), + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Commits(). + Lines( + Contains("pick").Contains("five"), + Contains("YOU ARE HERE").Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content2"), + Contains("======="), + Contains("content4"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑2 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("five").IsSelected(), + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one"), + ). + SelectNextItem() + + t.Views().Main(). + Content( + Contains("-content2"). + Contains("+content4"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go new file mode 100644 index 000000000..580a2af5b --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go @@ -0,0 +1,101 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with an interactive rebase strategy, where a conflict occurs. Also drop a commit while rebasing", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + shell.EmptyCommit("five") + + shell.SetConfig("pull.rebase", "interactive") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("five"), + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Commits(). + Focus(). + Lines( + Contains("pick").Contains("five").IsSelected(), + Contains("YOU ARE HERE").Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Lines( + Contains("drop").Contains("five").IsSelected(), + Contains("YOU ARE HERE").Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Files(). + Focus(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content2"), + Contains("======="), + Contains("content4"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Main(). + Content( + Contains("-content2"). + Contains("+content4"), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 635451b54..c99870d43 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -121,6 +121,12 @@ var tests = []*components.IntegrationTest{ sync.ForcePushMultipleUpstream, sync.Pull, sync.PullAndSetUpstream, + sync.PullMerge, + sync.PullMergeConflict, + sync.PullRebase, + sync.PullRebaseConflict, + sync.PullRebaseInteractiveConflict, + sync.PullRebaseInteractiveConflictDrop, sync.Push, sync.PushAndAutoSetUpstream, sync.PushAndSetUpstream, diff --git a/test/integration/pullMerge/expected/origin/HEAD b/test/integration/pullMerge/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMerge/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMerge/expected/origin/config b/test/integration/pullMerge/expected/origin/config deleted file mode 100644 index 90705ff13..000000000 --- a/test/integration/pullMerge/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMerge/actual/./repo diff --git a/test/integration/pullMerge/expected/origin/description b/test/integration/pullMerge/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMerge/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMerge/expected/origin/info/exclude b/test/integration/pullMerge/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMerge/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e b/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e deleted file mode 100644 index ce0f31a5a7e476e6430cf7acc5ef4fb90b2dc2a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fH0A1%4*$a~QF?j_Mp{pJvd3`~_*is_s?d=g<4GgmwU0Qo| z4+9_iX6CU#B9#bpWulsyYRxlHm7r1xP|rKn+?qFgbuY+>8~`zDsWOxpN-CK&&Rlci zB!K6jgUj!JUp7BZ{xVKC`{cGh?W9Y)dWbBl DuT@3q diff --git a/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad b/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad deleted file mode 100644 index 660fe0a45..000000000 --- a/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJF))1P!")#tyS5[ SPDYXgӽsuq8􈶭zK@&I"zzNɝ}˲*6%, \ No newline at end of file diff --git a/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d b/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d deleted file mode 100644 index e4b84263d..000000000 --- a/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9E$Dz`R"~kkKwU*NJ4!sVaG>9$4[-PH$`UZ5W)nb0&e5n^ܶ^,2EOQX'7[9% \ No newline at end of file diff --git a/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 b/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 deleted file mode 100644 index 4e97dab19024b7201b4a281f117162d6913a2e1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaA93d0}}MZ5MC?hD1y>8MajA*&o?j3W)i8iIxP_Vox|{LOoB@t0QX z+BHNx^+QCncL;oq#pEnfB1NHC5;+Q%C|jFMu?VDgKIGN4wdeztn2wH0K?)s EHv%h2{r~^~ diff --git a/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullMerge/expected/origin/packed-refs b/test/integration/pullMerge/expected/origin/packed-refs deleted file mode 100644 index e6e25ae85..000000000 --- a/test/integration/pullMerge/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -291b985e75f255f9947f064aee9e1f37af1a930d refs/heads/master diff --git a/test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 0b3113c2b..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -291b985e75f255f9947f064aee9e1f37af1a930d branch 'master' of ../origin diff --git a/test/integration/pullMerge/expected/repo/.git_keep/HEAD b/test/integration/pullMerge/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 83635ede7..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -673a4237450c6ea2a27b18f1d7a3c9293c5606ea diff --git a/test/integration/pullMerge/expected/repo/.git_keep/config b/test/integration/pullMerge/expected/repo/.git_keep/config deleted file mode 100644 index 1cff3a489..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = false diff --git a/test/integration/pullMerge/expected/repo/.git_keep/description b/test/integration/pullMerge/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/index b/test/integration/pullMerge/expected/repo/.git_keep/index deleted file mode 100644 index fc9d5cb17a4e6cee226b8cee0383968dc85eda2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmL&Ug@oeF{Dq%Du0|P75Jf%PehQ=if42)laYD9pTZRwuJe^pa& ze2EB+;>mZq5a89)eU*Vdw=yj=C)E(B0HmKi%l9UXhMJRsZjJ=c52FU9edk`TS`=Q@ z-||X(zJ)r>93zN12^@XT^?~MqX{b5>(9OA@&8vN;?AaUsQwoRF1-$${pV6_hSLrWKTYO21z4bZ-W{wHaoRA<_S0E+HV4`5a vrJq>B%G}`GFS0Q$VsY5>B 1648348767 +1100 commit (initial): myfile1 -224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 commit: myfile2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI 1648348767 +1100 commit: myfile3 -0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 commit: myfile4 -291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 reset: moving to HEAD~2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI 1648348767 +1100 commit: myfile4 -673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index b3175cf78..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 224786fb3e4a16b22b4e2b43fe01d7797491adad CI 1648348767 +1100 commit (initial): myfile1 -224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 commit: myfile2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI 1648348767 +1100 commit: myfile3 -0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 commit: myfile4 -291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 reset: moving to HEAD~2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI 1648348767 +1100 commit: myfile4 -673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 57e616700..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 fetch origin: storing head diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e b/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e deleted file mode 100644 index ce0f31a5a7e476e6430cf7acc5ef4fb90b2dc2a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fH0A1%4*$a~QF?j_Mp{pJvd3`~_*is_s?d=g<4GgmwU0Qo| z4+9_iX6CU#B9#bpWulsyYRxlHm7r1xP|rKn+?qFgbuY+>8~`zDsWOxpN-CK&&Rlci zB!K6jgUj!JUp7BZ{xVKC`{cGh?W9Y)dWbBl DuT@3q diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad b/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad deleted file mode 100644 index 660fe0a45..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJF))1P!")#tyS5[ SPDYXgӽsuq8􈶭zK@&I"zzNɝ}˲*6%, \ No newline at end of file diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d b/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d deleted file mode 100644 index e4b84263d..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9E$Dz`R"~kkKwU*NJ4!sVaG>9$4[-PH$`UZ5W)nb0&e5n^ܶ^,2EOQX'7[9% \ No newline at end of file diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea b/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea deleted file mode 100644 index c630a6f652114cf2b96f74fc136d11669dd8dbb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJnPwwnY*gr540&31zYV@rvkzqe2DIt8MajA*&o?j3W)i8iIxP_Vox|{LOoB@t0QX z+BHNx^+QCncL;oq#pEnfB1NHC5;+Q%C|jFMu?VDgKIGN4wdeztn2wH0K?)s EHv%h2{r~^~ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 deleted file mode 100644 index f75c9469059d49e384925b2a0d9e5368e63e2fa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmV;(05|`50gaC_Zo@DPMLYWx+%gn!MNy_An49=~3?cm40Z z;g`L&b%2-rG`bo1Dj0)fN67_B6~lreoRnBBiVws^Ipg%uZrcEfq`^}R?24Fr^>M)? zyGEsweWt?V4)Evuj7v^zk*jB}Ifq!C1U1Wsm7-SEOzt}A_qgvJ&KGz+U*7FU+vC&b zvbQ%t35i0AlHeK9x#?Js6T|+gPaoEA220ni+~L&p>qt+qSD5FQy|1@*n|=XjZBFyB CUT7=; diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d3548aa14bca5d35e0871b31e326387c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master b/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index b1c046dd7..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a61316509295a5644a82e38e8bd455422fe477c5 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index c2b075905..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -291b985e75f255f9947f064aee9e1f37af1a930d diff --git a/test/integration/pullMerge/expected/repo/myfile1 b/test/integration/pullMerge/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullMerge/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullMerge/expected/repo/myfile2 b/test/integration/pullMerge/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullMerge/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullMerge/expected/repo/myfile3 b/test/integration/pullMerge/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullMerge/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullMerge/expected/repo/myfile4 b/test/integration/pullMerge/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pullMerge/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pullMerge/recording.json b/test/integration/pullMerge/recording.json deleted file mode 100644 index 9b948e3eb..000000000 --- a/test/integration/pullMerge/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":537,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1401,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullMerge/setup.sh b/test/integration/pullMerge/setup.sh deleted file mode 100644 index 36d825537..000000000 --- a/test/integration/pullMerge/setup.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase false diff --git a/test/integration/pullMerge/test.json b/test/integration/pullMerge/test.json deleted file mode 100644 index 8ce8c71bb..000000000 --- a/test/integration/pullMerge/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with merge, ensure a merge commit is created upon pull", "speed": 10 } diff --git a/test/integration/pullMergeConflict/expected/origin/HEAD b/test/integration/pullMergeConflict/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMergeConflict/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/origin/config b/test/integration/pullMergeConflict/expected/origin/config deleted file mode 100644 index 53f811d27..000000000 --- a/test/integration/pullMergeConflict/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/./repo diff --git a/test/integration/pullMergeConflict/expected/origin/description b/test/integration/pullMergeConflict/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMergeConflict/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMergeConflict/expected/origin/info/exclude b/test/integration/pullMergeConflict/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMergeConflict/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c b/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c deleted file mode 100644 index 26794f8c9..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed$c`R"~׵[(x껈JEÐp9DDC wyu[dQX7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullMergeConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullMergeConflict/expected/origin/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 b/test/integration/pullMergeConflict/expected/origin/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 deleted file mode 100644 index fa0ad87b7b212728cb8911be86f784c2bc3eefc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZCdo7dB0^U^Mw-lE!PrtF=`~^A08nuUMF0Q* diff --git a/test/integration/pullMergeConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullMergeConflict/expected/origin/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d b/test/integration/pullMergeConflict/expected/origin/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d deleted file mode 100644 index 72dee6f910b0a29a80ae14be78878205fed2e18a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$a~Cq@5{<2wn9U)5!!2#+DL6Z*Pv^>OUTD@pUU@ ztscgBs)w2H79dm}AmxadC1TE!05b>W1)_Sb2?+ega&w2N-#=3$78aRg$21_;45+fG&cGk4{i*QcTT0SlZu Ev_(-!0RR91 diff --git a/test/integration/pullMergeConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMergeConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullMergeConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMergeConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullMergeConflict/expected/origin/packed-refs b/test/integration/pullMergeConflict/expected/origin/packed-refs deleted file mode 100644 index f70cbac49..000000000 --- a/test/integration/pullMergeConflict/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -29c0636a86cc64292b7a6b1083c2df10de9cde6c refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 33d82ab34..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,25 +0,0 @@ -Merge branch 'master' of ../origin - -# Conflicts: -# myfile4 -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/repo/.git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch master -# Your branch and 'origin/master' have diverged, -# and have 1 and 2 different commits each, respectively. -# (use "git pull" to merge the remote branch into yours) -# -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# new file: myfile3 -# modified: myfile4 -# diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 9aa8406f0..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -29c0636a86cc64292b7a6b1083c2df10de9cde6c branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 7dc5e85cc..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -4db288af7bc797a3819441c734a4c4e7e3635296 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/config b/test/integration/pullMergeConflict/expected/repo/.git_keep/config deleted file mode 100644 index 1cff3a489..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = false diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/description b/test/integration/pullMergeConflict/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/index b/test/integration/pullMergeConflict/expected/repo/.git_keep/index deleted file mode 100644 index bed2a78eca10827b0b73605f6e47bb6c7ad91ef5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmZ?q402{*U|<4bmL&W0zqq|uiNk0{1_oB9d4|;t42??|7#P0-)rbHw+tNLc|Ei|m z_!1Es#gp%JA;7Dp`zix_Ze?0#PO2eL0Z2cOi{?2P4K-&Hx;YX&Ka3ib_MLmVYEgJq zf6FWF`4;LhbBrM7{NXTMZVogDOhe2uGC()yem1Z6nX+eZ_)jSuQWx;@*VuJL8fK0$ z#GL=E3%4x?nggbx=9r?JbIIiBgYbVw$I4!%zc_92B`NmS>kybZCO~sSf?QpJlq7?R zf&rI)VhJmAgLA*g#Oc)Fp3=Is-OiW!a pR0K3E*u8pRjd`8YI&7AH( 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d67e84881..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 9d875f2ce..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 fetch origin: storing head diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c deleted file mode 100644 index 26794f8c9..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed$c`R"~׵[(x껈JEÐp9DDC wyu[dQX7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 deleted file mode 100644 index 53c1056c1..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 +++ /dev/null @@ -1,2 +0,0 @@ -xA -@ E])f/HҦDW=FIiGpy߶RhOuw9(`cITƄҍ7BĔKw_kdVAܰ걎&Xscp-b"iGxF=NUS;͋Smj#=] \ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 deleted file mode 100644 index fa0ad87b7b212728cb8911be86f784c2bc3eefc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZCdo7dB0^U^Mw-lE!PrtF=Z3-0x1%1O^6#~ga{+|xcaBZyoJgtMeuj2%1 sZ>f)T*aqnN>kjroVGvE0q9+k@7?77pY_zw6sTiGdkd#T_2b7c<7EBT*RR910 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae deleted file mode 100644 index 13e3f581a83ab9bb85f981c1ced8c88be9a191f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb`~^A08nuUMF0Q* diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 deleted file mode 100644 index 5a90eb5f918fb5e180245d8dc9c96d1db503915e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c2/5833e74799f64c317fe3f112f934fcc57b71f9 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c2/5833e74799f64c317fe3f112f934fcc57b71f9 deleted file mode 100644 index 03f46ce9a34adacf660ddd67a96504d436a4cd29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmV;&067160gaC_Zo@DP06Y5?+%gnMMUkQ;pePDt%FstpG@Tfz?Lc*bKEGbNcRkz< zXWO#OJ4C5Zdv}L831$u{Pzg+BLT)IMic%8K5}A@|syIBf`?>>e3OUTD@pUU@ ztscgBs)w2H79dm}AmxadC1TE!05b>W1)_Sb2?+ega&w2N-#=3$78aRg$21_;45+fG&cGk4{i*QcTT0SlZu Ev_(-!0RR91 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 4512ce2dd..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -c25833e74799f64c317fe3f112f934fcc57b71f9 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 9f6715ee9..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -29c0636a86cc64292b7a6b1083c2df10de9cde6c diff --git a/test/integration/pullMergeConflict/expected/repo/myfile1 b/test/integration/pullMergeConflict/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullMergeConflict/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullMergeConflict/expected/repo/myfile2 b/test/integration/pullMergeConflict/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullMergeConflict/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullMergeConflict/expected/repo/myfile3 b/test/integration/pullMergeConflict/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullMergeConflict/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullMergeConflict/expected/repo/myfile4 b/test/integration/pullMergeConflict/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pullMergeConflict/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pullMergeConflict/recording.json b/test/integration/pullMergeConflict/recording.json deleted file mode 100644 index 9631a1943..000000000 --- a/test/integration/pullMergeConflict/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1428,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2571,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3459,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3852,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4419,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5267,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6266,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullMergeConflict/setup.sh b/test/integration/pullMergeConflict/setup.sh deleted file mode 100644 index c36bbf6da..000000000 --- a/test/integration/pullMergeConflict/setup.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase false diff --git a/test/integration/pullMergeConflict/test.json b/test/integration/pullMergeConflict/test.json deleted file mode 100644 index c1d7a3480..000000000 --- a/test/integration/pullMergeConflict/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with merge, ensure we handle conflicts", "speed": 5 } diff --git a/test/integration/pullRebase/expected/origin/HEAD b/test/integration/pullRebase/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebase/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebase/expected/origin/config b/test/integration/pullRebase/expected/origin/config deleted file mode 100644 index 3b62fd0ac..000000000 --- a/test/integration/pullRebase/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebase/actual/./repo diff --git a/test/integration/pullRebase/expected/origin/description b/test/integration/pullRebase/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebase/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebase/expected/origin/info/exclude b/test/integration/pullRebase/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebase/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d b/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d deleted file mode 100644 index 285b95bdd..000000000 --- a/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃGW"DwsO(˪~1L, \ No newline at end of file diff --git a/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 b/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 deleted file mode 100644 index 93ffd3015ea80082e573f04b3772e906fc1aab5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$a}HOeP742wn9U`Ao22Y$*}+_Vx&FACJc?Ywyd@ z5a~2_5uLmxNG>*0t4NC+g=5QXIUsXI%%&j$t1a#F8rtVX;90ECNY$0-8+ZgNi7UHM zb8+FwRF&T2vF>`B^>v!>@=1Mr%B8IRrhzF~ifB-u0gO=xJ*I~IsjL2N%TrMO0N|K9 EVLIeVSpWb4 diff --git a/test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 b/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 deleted file mode 100644 index 48bff47beed3d87f7a985474654273b114f9ab0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fDMP26<*$a}%jA;TQLRUS;B%Q%RV@rvkw>L*{_2Kb&{Ib=$ zGz*DN?GUj(!+<3Qn3WKf2~~Lp)aXjg2)?@@h6xPC}S~m$ASC&Tad+zvZV_BKur`EcD=xs7^>>ZX2mSq04xPi;FX Dd2U0? diff --git a/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a b/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a deleted file mode 100644 index c6127ca4a05125043a1cc37e232b787dad1b82c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAJ3c@fDKwak)*$Xn0Ony*A=&Hv^hZ!t1wv-5ZdwT?TkH=d)-dbC_ z#X^^Uh*+l)6F~r317K`bRa0+# zi3pA2$#=RC;MLN7m4Q9CGA%PF)exuvq~GGFTqTT#np2Bzjs(vSqXwmY=U%Q_6kgTe z@=ANYg*wa}BZxU7jG5mz0L=l@5OYig(apJ^&8vN;?AaUsQwoRF1-$$Py$*qyV*)jYY5Fa&dq6bQ9Bop} zF$J0v66ER%q$C+k6%4p${9AmFJ7!2`*Y J#e*#U 1648349202 +1100 commit (initial): myfile1 -7ba4176e37b24d5c97f17214ca6d658dbc58ef9d 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349202 +1100 commit: myfile2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 CI 1648349202 +1100 commit: myfile3 -f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 commit: myfile4 -f2b972db67c4667ac1896df3556a2cb2422bef8a 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349203 +1100 reset: moving to HEAD~2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 25b115c8ff09bf59b023af22277ea140b2833110 CI 1648349203 +1100 commit: myfile5 -25b115c8ff09bf59b023af22277ea140b2833110 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349204 +1100 pull --no-edit: checkout f2b972db67c4667ac1896df3556a2cb2422bef8a -f2b972db67c4667ac1896df3556a2cb2422bef8a ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 pull --no-edit: myfile5 -ef833c09ff39663448dd9582e3d6ac1fa777fb4f ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 906b261f3..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7ba4176e37b24d5c97f17214ca6d658dbc58ef9d CI 1648349202 +1100 commit (initial): myfile1 -7ba4176e37b24d5c97f17214ca6d658dbc58ef9d 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349202 +1100 commit: myfile2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 CI 1648349202 +1100 commit: myfile3 -f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 commit: myfile4 -f2b972db67c4667ac1896df3556a2cb2422bef8a 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349203 +1100 reset: moving to HEAD~2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 25b115c8ff09bf59b023af22277ea140b2833110 CI 1648349203 +1100 commit: myfile5 -25b115c8ff09bf59b023af22277ea140b2833110 ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index ccc2918cc..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 fetch origin: storing head diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 b/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 deleted file mode 100644 index 38ec4954a1cca58777300f379a6da3991b9ef9b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeJnQwn-L5gr540O|pvxV@rvkzqe2DIt;^L$I6QA#5-lx=rbV#IG@~D&BnXDx=ol#&=VkYWC_425Qhx0sFOkp zSsgMNe)q?^+iAAfX}-&c+xC=8S=-G*z~qqz=k59EJ9E%us>`3cX7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d b/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d deleted file mode 100644 index 285b95bdd..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃGW"DwsO(˪~1L, \ No newline at end of file diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 b/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 deleted file mode 100644 index 93ffd3015ea80082e573f04b3772e906fc1aab5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$a}HOeP742wn9U`Ao22Y$*}+_Vx&FACJc?Ywyd@ z5a~2_5uLmxNG>*0t4NC+g=5QXIUsXI%%&j$t1a#F8rtVX;90ECNY$0-8+ZgNi7UHM zb8+FwRF&T2vF>`B^>v!>@=1Mr%B8IRrhzF~ifB-u0gO=xJ*I~IsjL2N%TrMO0N|K9 EVLIeVSpWb4 diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d b/test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d deleted file mode 100644 index 7820c1e956e4849930ec7b8fe8b1348344ee0236..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsQplF88r;s1<|mAy)TaoXZbQtYkQ JApo0uFGXEsGXVeq diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 b/test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 deleted file mode 100644 index 6b5097ac8cca7b1e7a66276e1a6ceca12195c537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL o8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR~Cjm||4|0Gc99wM4=|lK=n! diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f b/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f deleted file mode 100644 index 1bcc7cca964d784a3c18a3d090ee87e38913d01a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmV;K0A~Mq0fo-73c@fDfMMr6MRq}w%jJ@Qh|sBzaY-*&XlyAF^zH57?)vi$e_30b zyS52WeHYOwR$(`Z3B(w%aIRc}b%rPr_!yG$c0#8%-sRbKg`5IRnLtO diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 deleted file mode 100644 index 48bff47beed3d87f7a985474654273b114f9ab0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fDMP26<*$a}%jA;TQLRUS;B%Q%RV@rvkw>L*{_2Kb&{Ib=$ zGz*DN?GUj(!+<3Qn3WKf2~~Lp)aXjg2)?@@h6xPC}S~m$ASC&Tad+zvZV_BKur`EcD=xs7^>>ZX2mSq04xPi;FX Dd2U0? diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a deleted file mode 100644 index c6127ca4a05125043a1cc37e232b787dad1b82c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAJ3c@fDKwak)*$Xn0Ony*A=&Hv^hZ!t1wv-5ZdwT?TkH=d)-dbC_ z#X^^Uh*+l)6F~r31 myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo test4 > myfile5 -git add . -git commit -am "myfile5" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase true diff --git a/test/integration/pullRebase/test.json b/test/integration/pullRebase/test.json deleted file mode 100644 index 224a93e54..000000000 --- a/test/integration/pullRebase/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with rebase, ensure we rebase upon pull", "speed": 10 } diff --git a/test/integration/pullRebaseConflict/expected/origin/HEAD b/test/integration/pullRebaseConflict/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/origin/config b/test/integration/pullRebaseConflict/expected/origin/config deleted file mode 100644 index 22a73c314..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseConflict/actual/./repo diff --git a/test/integration/pullRebaseConflict/expected/origin/description b/test/integration/pullRebaseConflict/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseConflict/expected/origin/info/exclude b/test/integration/pullRebaseConflict/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b b/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b deleted file mode 100644 index 92dba726a..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃW"DwsO(˪~1P, \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 b/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 deleted file mode 100644 index cf8b94a346a06a746d01f00ab8d7aae8c7c8bbe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$Xn6BvS`Ogsyswd}grF*is_s?d=iVyv5@!URhh4 zyLB8+eHXE5@WG|X3bl$T6AQ6s@^nR_ikLw$I5Jz><<%{Kr&K_q#^~ul)~Y230cIT3 ziBzBckWG5`=epZ*vbS-1$S1XJkxN`~^A08nuUMF0Q* diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 b/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 deleted file mode 100644 index 8ebe82e5a61476ade947913562116fd39528ef22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}%u!h9UWf56A8OlEF1)szg%k>g>b}lpN08nuUO8@`> diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebaseConflict/expected/origin/packed-refs b/test/integration/pullRebaseConflict/expected/origin/packed-refs deleted file mode 100644 index edf7e7c39..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -702648e6efd5f8c60f5fe57e152850a5de756978 refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 2f4ead100..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 conflict diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index d74d32218..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -702648e6efd5f8c60f5fe57e152850a5de756978 branch 'master' of ../origin diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index c7f24c5a8..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -d450cc8f4e691e3043aac25ae71f0f1a3217368f diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/config b/test/integration/pullRebaseConflict/expected/repo/.git_keep/config deleted file mode 100644 index c85b6d3bb..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = true diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/description b/test/integration/pullRebaseConflict/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/index b/test/integration/pullRebaseConflict/expected/repo/.git_keep/index deleted file mode 100644 index ceeffd34e1a0913f981820804b3ec826b1063556..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmZ?q402{*U|<4bmL&TND&ou1TVOOJ0|P75Jo5?$hQ=if42)laYD9pTZRwuJe^pa& ze2EB+;>mZq5a89)eU*Vdw=yj=C)E(B0Hj~ysa7hChMLolZjJ=c52FU9edk`TS`=Q@ z-||X(zJ)r>93zN1s&WtJ%>bGMrXl74)u6fOem1Z6nX+eZ_)jSuQWx;@*VuJL8fK0$ z#2j_5Bfg)3=74FaIe}>AaLyK&{Cb{kYDPss!-Czb_tlu!DXoKU^Ux@DUfCBgb(O3NhowbyGo*F8uH3~~(x1*QWeC`=d(7z_;z%uGyR)FqRn55oT$ q9V>g4{^GR7m!#NRuS2j|DmXoCy_4GZcL~={vfbfM50`gly9NLbS&el7 diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude b/test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 89cdca1d7..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b CI 1648349220 +1100 commit (initial): myfile1 -0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 commit: myfile2 -308a85a7f740d42925175560337196f952ac6cf6 ae0aa5a0d1c65005bd50012612b1c56c1ea06155 CI 1648349220 +1100 commit: myfile3 -ae0aa5a0d1c65005bd50012612b1c56c1ea06155 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 commit: myfile4 -702648e6efd5f8c60f5fe57e152850a5de756978 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 reset: moving to HEAD~2 -308a85a7f740d42925175560337196f952ac6cf6 d450cc8f4e691e3043aac25ae71f0f1a3217368f CI 1648349220 +1100 commit: myfile4 conflict -d450cc8f4e691e3043aac25ae71f0f1a3217368f 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349221 +1100 pull --no-edit: checkout 702648e6efd5f8c60f5fe57e152850a5de756978 -702648e6efd5f8c60f5fe57e152850a5de756978 bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase: myfile4 conflict -bdd975a23140e915dd46a1a16575c71bcad754ca bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d538b98ff..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b CI 1648349220 +1100 commit (initial): myfile1 -0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 commit: myfile2 -308a85a7f740d42925175560337196f952ac6cf6 ae0aa5a0d1c65005bd50012612b1c56c1ea06155 CI 1648349220 +1100 commit: myfile3 -ae0aa5a0d1c65005bd50012612b1c56c1ea06155 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 commit: myfile4 -702648e6efd5f8c60f5fe57e152850a5de756978 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 reset: moving to HEAD~2 -308a85a7f740d42925175560337196f952ac6cf6 d450cc8f4e691e3043aac25ae71f0f1a3217368f CI 1648349220 +1100 commit: myfile4 conflict -d450cc8f4e691e3043aac25ae71f0f1a3217368f bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index db9c9657f..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b deleted file mode 100644 index 92dba726a..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃW"DwsO(˪~1P, \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 deleted file mode 100644 index cf8b94a346a06a746d01f00ab8d7aae8c7c8bbe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$Xn6BvS`Ogsyswd}grF*is_s?d=iVyv5@!URhh4 zyLB8+eHXE5@WG|X3bl$T6AQ6s@^nR_ikLw$I5Jz><<%{Kr&K_q#^~ul)~Y230cIT3 ziBzBckWG5`=epZ*vbS-1$S1XJkxN`~^A08nuUMF0Q* diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 deleted file mode 100644 index 8ebe82e5a61476ade947913562116fd39528ef22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}%u!h9UWf56A8OlEF1)szg%k>g>b7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 deleted file mode 100644 index ae05cad1e9b8020cd457f6f2dbbad862ed152c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mDV}sySB22|cy| diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca deleted file mode 100644 index 32a1c9b2a..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca +++ /dev/null @@ -1,3 +0,0 @@ -x -0E]+d<@D誟1&,4M)½ܛZK̩3 - 6j)g3DbgQ޺ d,!9(X=+0G}vii%zjX JAǩtEee+Sʺ.= \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f deleted file mode 100644 index 2850a992e..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Ѯs e&L Rp11Q#ty[s9[+S]JHJHEbˑf=*H,`"\(ka#/[}Xd<%^Yϩ~˼de=W<[ \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 deleted file mode 100644 index 46f078ceee2ed262a72d6f0f45a22f3d94426414..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0ZYosPf{>5WUzq%1rJw87p{`j;t~@sTL|Dv&d*EB$xJTcvV#DH+{(1f OoKzD9xC8)|0TdpJ myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase true diff --git a/test/integration/pullRebaseConflict/test.json b/test/integration/pullRebaseConflict/test.json deleted file mode 100644 index 39ddf1e3d..000000000 --- a/test/integration/pullRebaseConflict/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with rebase, ensure we handle conflicts", "speed": 10 } diff --git a/test/integration/pullRebaseInteractive/expected/origin/HEAD b/test/integration/pullRebaseInteractive/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/origin/config b/test/integration/pullRebaseInteractive/expected/origin/config deleted file mode 100644 index c10372133..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractive/actual/./repo diff --git a/test/integration/pullRebaseInteractive/expected/origin/description b/test/integration/pullRebaseInteractive/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractive/expected/origin/info/exclude b/test/integration/pullRebaseInteractive/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 b/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 deleted file mode 100644 index 41731f66004318ac5ac59295a2b73c038d78de6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZCdniNB0^U^Mw-rG!PrtF=nM8K*P zie{gZt7OW%Ki1t2qrDE}T|T94Pr1~!-7HYZJ}`!8&j8MuqaIUT{^X{8b$JS!AC-MM Ex}y+EyZ`_I diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 b/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 deleted file mode 100644 index bf8c283f0..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@ѮsJ&cR -<ƘL#tyS5[ S0jDs XZLER۫0p~Mo)v4;9i'w-~3, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca b/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca deleted file mode 100644 index d3ebd3660896b94c5d54c06d34b0a7b24db22314..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaA93d0}}0DJZo-V4Qb)hL8g$SKdzb(aQW6M}{I_stV}8W`p`~^A08nuUMF0Q* diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 b/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 deleted file mode 100644 index 8d51321bd..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9Ed&Dzd:łD#׵֥yv3f!%`J3rA2ENS{t[|S ɤh`JIдZ -4nuxO.֛GDzL5J9? \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebaseInteractive/expected/origin/packed-refs b/test/integration/pullRebaseInteractive/expected/origin/packed-refs deleted file mode 100644 index 6060b6bc3..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -d43a810e4d47f2c632ea62ae581a8aade6f23b21 refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index f09f5548b..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,16 +0,0 @@ -myfile4 conflict - -# 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 d43a810 -# Last command done (1 command done): -# pick e974f4a myfile4 conflict -# Next commands to do (3 remaining commands): -# pick d217625 5 -# pick 09f87d1 6 -# You are currently rebasing branch 'master' on 'd43a810'. -# -# Changes to be committed: -# modified: myfile4 -# diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 5b1cee8fc..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -d43a810e4d47f2c632ea62ae581a8aade6f23b21 branch 'master' of ../origin diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 3bcbef789..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -e974f4acf07db6fcaa438df552a8fd44e2d58dcd diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config deleted file mode 100644 index 6dc2c0ed8..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = interactive diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/description b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index deleted file mode 100644 index 531e6a734cb7b211013b3a98f1d610eb25f46094..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 550 zcmZ?q402{*U|<4b_9XiYwqmEcF2QI<1_oB9dDfB)42??|7#P0-)rbHw+tNLc|Ei|m z_!1Es#gp%JA;7Dp`zix_Ze?0#PO2eL0Z702qZ%a`4K>FA-5d#?A4UyI`_8>wwJ5x* zzvY$od<%7$IYtn3?0G+y@c_*M(@=AMqnmR-n^*fx*|RtNrxXsU3wZf!>^dS1GshTW zj)T6+kzk-XU>ahM4G)?*oU_Fxzn*8Cno$wZuweJN6ndol3}_CR zhMJ>=W)ADzb?bMw`Ft@5T{n5(hV|EuUv$~O1ZIvY)Er^e(nBC~Ks3}GYf{WHgPD`* zRtq)A;lbXpgAEyuC73ejX~E?!GP=18|k}CB_^*pm{;DsoO^Df`|Vvf0Em>c A>Hq)$ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 610710e3e..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,15 +0,0 @@ -0000000000000000000000000000000000000000 7c0506ec2cd7852818e3e597619ff64af83770c6 CI 1648349245 +1100 commit (initial): myfile1 -7c0506ec2cd7852818e3e597619ff64af83770c6 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 commit: myfile2 -52137603da2dccb618dfa0953d1b7df8c0255959 91d2303b08e6765e0ec38c401ecbab0cbb126dca CI 1648349245 +1100 commit: myfile3 -91d2303b08e6765e0ec38c401ecbab0cbb126dca d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 commit: myfile4 -d43a810e4d47f2c632ea62ae581a8aade6f23b21 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 reset: moving to HEAD~2 -52137603da2dccb618dfa0953d1b7df8c0255959 e974f4acf07db6fcaa438df552a8fd44e2d58dcd CI 1648349245 +1100 commit: myfile4 conflict -e974f4acf07db6fcaa438df552a8fd44e2d58dcd d217625c37713436bb6c92ff9d0b3991a8a7dba5 CI 1648349245 +1100 commit: 5 -d217625c37713436bb6c92ff9d0b3991a8a7dba5 09f87d11c514ba0a54e43193aaf9067174e2315e CI 1648349245 +1100 commit: 6 -09f87d11c514ba0a54e43193aaf9067174e2315e 2e0409bb60df3c4587245fd01fdeb270bb5a24f3 CI 1648349245 +1100 commit: 7 -2e0409bb60df3c4587245fd01fdeb270bb5a24f3 d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349247 +1100 rebase -i (start): checkout d43a810e4d47f2c632ea62ae581a8aade6f23b21 -d43a810e4d47f2c632ea62ae581a8aade6f23b21 66d3639353f039f2b87ea3e0dd3db13a5415c6df CI 1648349249 +1100 rebase -i (continue): myfile4 conflict -66d3639353f039f2b87ea3e0dd3db13a5415c6df 5c4dd6c94fae2afe48f413f48dc998ae48fcf463 CI 1648349249 +1100 rebase -i (pick): 5 -5c4dd6c94fae2afe48f413f48dc998ae48fcf463 ff0d57cafe9d745264b23450e9268cdb5ddc4edc CI 1648349249 +1100 rebase -i (pick): 6 -ff0d57cafe9d745264b23450e9268cdb5ddc4edc 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (pick): 7 -416178fd7462af72f4357dda1241fc66063e467b 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 8f16c1e9c..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 7c0506ec2cd7852818e3e597619ff64af83770c6 CI 1648349245 +1100 commit (initial): myfile1 -7c0506ec2cd7852818e3e597619ff64af83770c6 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 commit: myfile2 -52137603da2dccb618dfa0953d1b7df8c0255959 91d2303b08e6765e0ec38c401ecbab0cbb126dca CI 1648349245 +1100 commit: myfile3 -91d2303b08e6765e0ec38c401ecbab0cbb126dca d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 commit: myfile4 -d43a810e4d47f2c632ea62ae581a8aade6f23b21 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 reset: moving to HEAD~2 -52137603da2dccb618dfa0953d1b7df8c0255959 e974f4acf07db6fcaa438df552a8fd44e2d58dcd CI 1648349245 +1100 commit: myfile4 conflict -e974f4acf07db6fcaa438df552a8fd44e2d58dcd d217625c37713436bb6c92ff9d0b3991a8a7dba5 CI 1648349245 +1100 commit: 5 -d217625c37713436bb6c92ff9d0b3991a8a7dba5 09f87d11c514ba0a54e43193aaf9067174e2315e CI 1648349245 +1100 commit: 6 -09f87d11c514ba0a54e43193aaf9067174e2315e 2e0409bb60df3c4587245fd01fdeb270bb5a24f3 CI 1648349245 +1100 commit: 7 -2e0409bb60df3c4587245fd01fdeb270bb5a24f3 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (finish): refs/heads/master onto d43a810e4d47f2c632ea62ae581a8aade6f23b21 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index fdad392f4..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 deleted file mode 100644 index 48767aa886048b23cf097a219630e55c2d620115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmV-{0Dk{?0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x j9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRExd__Fx36wv- diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb deleted file mode 100644 index ce54059d4b0dbc41f1737e1d9066c5174195c006..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67 zcmV-J0KETr0ZYosPf{>9Vz7Y#1rJw87p{`j;t~@sTL|Dv&d*EB$xJTcvV#DHR7-P{ ZG?PRcM1-z-jQmVcFt(Hk9^W3p?c-a#viANQ z7GgY&UDd|YN?@oih!8j;uPD$$(d>yak&2**m@V!49=19N?5OwXf|* zq?kg@iA?&8$GY2jvDbOI>o@i7rI)hyn+3+`Q5=#z15A@S>M=F+Pj1-!00h)G4%@6s A`2YX_ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 deleted file mode 100644 index 4df0a731dc343a188a0fb290b2f5128b2f1153cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0V^p=O;s>5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< O6eVU@l>h(|3R+9Gh)mxA diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 deleted file mode 100644 index 1d9689812460bd02db300c48db237e472bd993f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmV;B0B`?z0gaAJ3c@fDKwak)*$Xn0%;W(!~YmF+q{c%>_>_s^dn$4l9d_Gn?%C9u{&-u_6{mS_Fhi$z%2+EklSH yNskh%k7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b deleted file mode 100644 index 3744a685d8de21e43ecd5c7d28c57ffb4cf70148..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0fmmc3IZ_@0Il;C=>^Fqn-?4+Ty>w3&2CUI-f=|m^S#2}a)v3UuDw5o zhLlcY7txHVHUNr^hzml_6kQ<7l3L+HEk-8?sjckt8oD*ZKGxDCb3|_gl6B~fWE)at z^2`;5t19ntUw1t(dYYG;d`jP*a;a;-Y6zGdW{X~*0gO?HJ*I~I$@4E)QGEfj3px5( C^h4nQ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 deleted file mode 100644 index 41731f66004318ac5ac59295a2b73c038d78de6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZCdniNB0^U^Mw-rG!PrtF=nM8K*P zie{gZt7OW%Ki1t2qrDE}T|T94Pr1~!-7HYZJ}`!8&j8MuqaIUT{^X{8b$JS!AC-MM Ex}y+EyZ`_I diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 deleted file mode 100644 index 053e1cb24..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 +++ /dev/null @@ -1,2 +0,0 @@ -x1 -1@Q" L&N@Dj1I&(wY"x|◥ǰ06U g%/1BR3{*, }KlV5l#&$lgTkv(X/f{~O=_1$0{ݧ /8 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 deleted file mode 100644 index 7fc19f59cbcc2e293c0a9a8dd2f4d3013aaf1d13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmV;50CoR(0V^p=O;s>5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x s9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;MX|%&{r~070o;-dj;aga7~l diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df deleted file mode 100644 index 534bfc3870017c5e457777986c8cbc67a5fe2d37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0fmms3c@fD06pg`au+0o72rTCH=J zTA5SdndPK2ne4z41Z9hg7%*z|l(Y9)MPgPCEr^YFUc1a_D1c(j=!;IyXeOtLZ2$^H znO)Il(je&BA8nVzD6hkK=NHv&;Y(`uCc$Aa--?xI0Hwr1kEzao^!U?7eV2J*l&P&{ LnNt@Z)89R&rZG(W diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 deleted file mode 100644 index bf8c283f0..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@ѮsJ&cR -<ƘL#tyS5[ S0jDs XZLER۫0p~Mo)v4;9i'w-~3, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 deleted file mode 100644 index 8baacd0ccd5fe2758294c8efa531a7bf282c1f13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x o9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;Lqy0K~gZYgBqc;s5{u diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca deleted file mode 100644 index d3ebd3660896b94c5d54c06d34b0a7b24db22314..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaA93d0}}0DJZo-V4Qb)hL8g$SKdzb(aQW6M}{I_stV}8W`p`~^A08nuUMF0Q* diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 deleted file mode 100644 index 5a90eb5f918fb5e180245d8dc9c96d1db503915e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 deleted file mode 100644 index ae05cad1e9b8020cd457f6f2dbbad862ed152c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mDV}sySB22|cy| diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 deleted file mode 100644 index 96116a717fbfe8d4f8f260c68a7530bc3bae78f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0gcW<3c@fDKvCB@MfQSB)0t!nB0^U^#w0UA!PrtFczk;Vx1YE8Wo_-* z{lI+cyO{?N$T0zOHb#kJA_O@k(Fr6|Od5&D}lpN08nuUO8@`> diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 deleted file mode 100644 index 8d51321bd..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9Ed&Dzd:łD#׵֥yv3f!%`J3rA2ENS{t[|S ɤh`JIдZ -4nuxO.֛GDzL5J9? \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e deleted file mode 100644 index d63c59fb0e8394b0782dd66ed7f317f0e55a06dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0V^p=O;s>5F=a3`FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< R6eVVam6&5y0svvIYS62oPv-yt diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd deleted file mode 100644 index dc8909137e9bbe69e499e9420551445c7d57b03a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmV;N0Av4n0gcW<3c@fDKvCB@MfQTsBr|COB7&(H&(6mw_=(<)b ztpk7Rdnr~*4hjP3G(?G0K$ZzG@)W3YQbNi!P%tmq%i1kF^g{rj#bwol$6N&x`;60& zYgBN|iIb6ce{Q>djQ08%@8u)ywUmo)?Pf7h^pqU2JtG2`qaIVe{K-xG)_EypbzAE) KYd1f)9X&{U&`R_G diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 deleted file mode 100644 index b0b5fcfd94a82a824337e37327c599f2dbe1f932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< I01`Jz+3(>@2LJ#7 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc deleted file mode 100644 index e278bfbe8..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc +++ /dev/null @@ -1,2 +0,0 @@ -xA -1 E] ҴiM@Dmuw.u><ƪ#F F$acJ BȐ$Y9|Z&!LjX׸ͫ4]/j7 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 99eb1dca1..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -416178fd7462af72f4357dda1241fc66063e467b diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 6a52d4f85..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -d43a810e4d47f2c632ea62ae581a8aade6f23b21 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile1 b/test/integration/pullRebaseInteractive/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile2 b/test/integration/pullRebaseInteractive/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile3 b/test/integration/pullRebaseInteractive/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile4 b/test/integration/pullRebaseInteractive/expected/repo/myfile4 deleted file mode 100644 index 9b1719f5c..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile5 b/test/integration/pullRebaseInteractive/expected/repo/myfile5 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile5 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile6 b/test/integration/pullRebaseInteractive/expected/repo/myfile6 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile6 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile7 b/test/integration/pullRebaseInteractive/expected/repo/myfile7 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile7 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractive/recording.json b/test/integration/pullRebaseInteractive/recording.json deleted file mode 100644 index dee2e4d8b..000000000 --- a/test/integration/pullRebaseInteractive/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1280,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2392,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2640,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2896,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3384,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4158,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/setup.sh b/test/integration/pullRebaseInteractive/setup.sh deleted file mode 100644 index fc90cd285..000000000 --- a/test/integration/pullRebaseInteractive/setup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -echo test > myfile5 -git add . -git commit -am "5" - -echo test > myfile6 -git add . -git commit -am "6" - -echo test > myfile7 -git add . -git commit -am "7" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase interactive diff --git a/test/integration/pullRebaseInteractive/test.json b/test/integration/pullRebaseInteractive/test.json deleted file mode 100644 index 7eb652fa1..000000000 --- a/test/integration/pullRebaseInteractive/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with interactive rebase, ensure we handle conflicts", "speed": 5 } diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/config b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/config deleted file mode 100644 index 73340e39e..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractiveWithDrop/actual/./repo diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/description b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/info/exclude b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 deleted file mode 100644 index d30bb28d3..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@] L~ "tcL,[J=xumm -.b k0+!* `~^A08nuUMF0Q* diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 deleted file mode 100644 index 352f68426..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed&iDz4D#/kK tj}$ȝXgUe#'d`Hn˻75͢X"RH!3!aє@ JInuxOS/e7L)` ;1Oז 9 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 deleted file mode 100644 index ae9c8a4b3..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9IfDz$`R"~◵ |*)0 -b%k𖝔$-Pª+}lpN08nuUO8@`> diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f deleted file mode 100644 index 8493481ba..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9ɤ$cL!R"~H|*x\GMH1qIkT%_wnЏkKnvdJ!"wG=&]ξu3@, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/packed-refs b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/packed-refs deleted file mode 100644 index ac36017fa..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -ce137eabb7b8df81d4818ac8a16892b1f7327219 refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index aae7c1fe0..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,16 +0,0 @@ -myfile4 conflict - -# 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 ce137ea -# Last command done (1 command done): -# pick 6ba64de myfile4 conflict -# Next commands to do (3 remaining commands): -# pick 6226d76 5 -# drop 67c0063 6 -# You are currently rebasing branch 'master' on 'ce137ea'. -# -# Changes to be committed: -# modified: myfile4 -# diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 42c066f5e..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -ce137eabb7b8df81d4818ac8a16892b1f7327219 branch 'master' of ../origin diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 6543423cd..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -6ba64def9b38eb7bcf5aa1a6c513c490967062ad diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/config b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/config deleted file mode 100644 index 6dc2c0ed8..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = interactive diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/description b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/index b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/index deleted file mode 100644 index ab845457fbbad9e320c8725236253a36cad748a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 550 zcmZ?q402{*U|<4bwj}!t;j)eq4KSLKfq|82p1lAAL*o(#2F9;IH6kE&OZPnftD1V_ zOGIcCPrlQI0I!zrs|@V9m1&tdsfIuWApLUj2c%&%)Esqmb0m0v7&R#EJNI(cqVTHz zmRH*IE!1J=7(vX5l&K531vCdtL(TbuZqEH|UhOkw&))E#QaGe8;N`Ee>xeYW9Ak(% zvC?;n;(+FWX^1%vtZ3$N&K8&adY)}+Mnyowg59h4)tJ{Qt%I3k0x>6!u|Q)b&>S!g zHAfT89M-w(*6(cd`C<^dZt}hj>#rTZ=(2wa%p6mgIeXeb?ular(ol1(NioM9Xii9w zt1FOVW6(8JFyIPu4F$!d10){I7z_;z%uGxe3}6gwuEHjkc!=|P%lE&F)i{@m?YBB1 JHeqwqJOG+|xc&eD diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/info/exclude b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 4433eb7f1..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,14 +0,0 @@ -0000000000000000000000000000000000000000 fefea9e2c324080a61d03142554b81e410e9c87f CI 1648349271 +1100 commit (initial): myfile1 -fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 commit: myfile2 -a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI 1648349271 +1100 commit: myfile3 -6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 commit: myfile4 -ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 reset: moving to HEAD~2 -a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI 1648349271 +1100 commit: myfile4 conflict -6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI 1648349271 +1100 commit: 5 -6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI 1648349271 +1100 commit: 6 -67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI 1648349271 +1100 commit: 7 -3c2846a93bb9c2815e3218ac3c906da26d159068 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349273 +1100 rebase -i (start): checkout ce137eabb7b8df81d4818ac8a16892b1f7327219 -ce137eabb7b8df81d4818ac8a16892b1f7327219 281c7e805fd7bf133611e701ef01f0a4f362f232 CI 1648349278 +1100 rebase -i (continue): myfile4 conflict -281c7e805fd7bf133611e701ef01f0a4f362f232 d13fd4cd73174c7048108d2dc8d277a8e013d1e4 CI 1648349278 +1100 rebase -i (pick): 5 -d13fd4cd73174c7048108d2dc8d277a8e013d1e4 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (pick): 7 -72da3b902dcd9e99b21bdc36891e028b8dbfb219 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 816678825..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 fefea9e2c324080a61d03142554b81e410e9c87f CI 1648349271 +1100 commit (initial): myfile1 -fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 commit: myfile2 -a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI 1648349271 +1100 commit: myfile3 -6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 commit: myfile4 -ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 reset: moving to HEAD~2 -a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI 1648349271 +1100 commit: myfile4 conflict -6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI 1648349271 +1100 commit: 5 -6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI 1648349271 +1100 commit: 6 -67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI 1648349271 +1100 commit: 7 -3c2846a93bb9c2815e3218ac3c906da26d159068 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (finish): refs/heads/master onto ce137eabb7b8df81d4818ac8a16892b1f7327219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index b4fbeb7a0..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 deleted file mode 100644 index 48767aa886048b23cf097a219630e55c2d620115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmV-{0Dk{?0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x j9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRExd__Fx36wv- diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b deleted file mode 100644 index 90bf4a1393aabdc89cae1baf1bf51debd33a32f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0V^p=O;s>5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< O6eZ?Zl>h(|AX-eiOHFnF diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 deleted file mode 100644 index 01b717854fd59176e7f389ce4c270bc5500a7dfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0fml13d0}}0DJZo-V4Q5lU<>dLQZ+csw)k|8iIxP_syaAUWb91)M{P2 zw#J?ME~2B&?D7Z$1DTK;k#k1OCa{PZ{Qzp?U7lSh0f)jdVx(LMvL_%;#4u8@ z5ehns7J}kef3#gsv%XIAUEW-`RW7O3n}*SoJ1PkJ3}B2p=rPshk4`^b)lXSg@jA6< MS(nt+7s6aUVW*x7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab deleted file mode 100644 index 8a1d879aa9f2f246efefd75d4f6fa8c57883e2e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67 zcmV-J0KETr0ZYosPf{>9Vz7Y#1rJw87p{`j;t~@sTL|Dv&d*EB$xJTcvV#Bxv!p~b Zlay3FJw1io%CyX!R1*cb8US&P7WSTX95Mg^ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 deleted file mode 100644 index 3622a8addbf20305d8398df5d200bc6cdf2dee09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0gaAJ3c@fDKwak)*$Xl=NoGHdsvnNzz$mxmpS{&n6Q=%I0X@D zN6k^IV$x?k*4@sFz0S*Bzo~C8y_B`zEV7TzPb6s1hydoG$JEe2btC2nJXSYcyp}|N diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 deleted file mode 100644 index 7fc19f59cbcc2e293c0a9a8dd2f4d3013aaf1d13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmV;50CoR(0V^p=O;s>5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x s9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;MX|%&{r~070o;-dj;aga7~l diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 deleted file mode 100644 index 88e06fe16..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 +++ /dev/null @@ -1,4 +0,0 @@ -x -0=+rd$Do- -֖ϷuvuŲRfCgA&8H \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 deleted file mode 100644 index 6282c8a0f8b674a8ad472b2daeeb928d3f8b2d76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmV;B0B`?z0gaAJ3c@fH0A1%4*$dK_yiXp82wn9UX?#J!*is^ReCrL|4Z|#^EUi7d zhm;O|GxMp`A`G`6ssw>38Y)yNHb-L2WU8pDZq1v$y5|u1Cd?E}B+r>+A*xt0MZ`Gl yP=%7H%kO?)Ha|}OJWf~p#9&nA*VcJH7gCo7=nfN_stV}9cEy1t99wx zn&Hw95zR7FHf+FV3LFxF<76PXL|9zR2soohQac~AbRs8O+cIa`^_i=j4hwHw|Ew}p6Ko|y$)`PwR7^6;lPIdWHSM^(#RZ!=)m37Ho J{Q#0?JorZmN^$@I diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 deleted file mode 100644 index d30bb28d3..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@] L~ "tcL,[J=xumm -.b k0+!* ^Gd9=n2waMgWAF1ta&nB$1x=X-^{%@o5FQ+jKU zVS)KDHdTwsVa6N@DWz1<#j2GmL?liMDhre-VKHmo^fj!2uM&!o2MUE;U~nubWd~7a zb>IawnEW31zS(KEmubG~C%5&fr_$TiLJI7|842tWz&W$qeQM~RoPW6?^94GcH)&M} BMM3}o diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 deleted file mode 100644 index 8baacd0ccd5fe2758294c8efa531a7bf282c1f13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x o9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;Lqy0K~gZYgBqc;s5{u diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae deleted file mode 100644 index 13e3f581a83ab9bb85f981c1ced8c88be9a191f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb`~^A08nuUMF0Q* diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 deleted file mode 100644 index 352f68426..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/a8/88f490faa49a665557b35171f4ce0896414ea2 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed&iDz4D#/kK tj}$ȝXgUe#'d`Hn˻75͢X"RH!3!aє@ JInuxOS/e7L)` ;1Oז 9 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 deleted file mode 100644 index 5a90eb5f918fb5e180245d8dc9c96d1db503915e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 deleted file mode 100644 index ae05cad1e9b8020cd457f6f2dbbad862ed152c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mDV}sySB22|cy| diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 deleted file mode 100644 index ae9c8a4b3..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/ce/137eabb7b8df81d4818ac8a16892b1f7327219 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9IfDz$`R"~◵ |*)0 -b%k𖝔$-Pª+FR3v73( -~)m/mG(r蛪7U#H"\TbbL5TnBֲ{lYM2'D̀j%'2br_2O=ezLA8)?"S]pqZ7 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 deleted file mode 100644 index b0b5fcfd94a82a824337e37327c599f2dbe1f932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< I01`Jz+3(>@2LJ#7 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f deleted file mode 100644 index 8493481ba..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9ɤ$cL!R"~H|*x\GMH1qIkT%_wnЏkKnvdJ!"wG=&]ξu3@, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 388a5b886..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -72da3b902dcd9e99b21bdc36891e028b8dbfb219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index a350da945..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -ce137eabb7b8df81d4818ac8a16892b1f7327219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 deleted file mode 100644 index 9b1719f5c..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractiveWithDrop/recording.json b/test/integration/pullRebaseInteractiveWithDrop/recording.json deleted file mode 100644 index 9c1f842cb..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1430,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2247,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2630,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2886,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3175,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3599,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4357,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4630,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4983,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5214,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5470,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5989,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6838,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/setup.sh b/test/integration/pullRebaseInteractiveWithDrop/setup.sh deleted file mode 100644 index fc90cd285..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/setup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -echo test > myfile5 -git add . -git commit -am "5" - -echo test > myfile6 -git add . -git commit -am "6" - -echo test > myfile7 -git add . -git commit -am "7" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase interactive diff --git a/test/integration/pullRebaseInteractiveWithDrop/test.json b/test/integration/pullRebaseInteractiveWithDrop/test.json deleted file mode 100644 index 6f85ff5b7..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with interactive rebase, ensure we handle conflicts and show commits yet to be rebased", "speed": 5 }