From 22c10479d528d3d9982f142139f82a8c764a550d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Feb 2023 21:15:03 +1100 Subject: [PATCH 1/3] migrate reflog integration tests --- .../cherry_pick/cherry_pick_conflicts.go | 5 +- pkg/integration/tests/reflog/checkout.go | 55 ++++++++ pkg/integration/tests/reflog/cherry_pick.go | 50 +++++++ pkg/integration/tests/reflog/patch.go | 64 +++++++++ pkg/integration/tests/reflog/reset.go | 49 +++++++ pkg/integration/tests/tests_gen.go | 5 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 353 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 10 -- .../repo/.git_keep/logs/refs/heads/branch2 | 4 - .../repo/.git_keep/logs/refs/heads/ma | 1 - .../repo/.git_keep/logs/refs/heads/master | 4 - .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 36 -> 0 bytes .../10/e005e1fa2db07721aa63cb048b87b7a2830b64 | Bin 148 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 | Bin 119 -> 0 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 24 -> 0 bytes .../37/661793a793e075730b85b9c3b300195738fc63 | Bin 147 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 31 -> 0 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 127 -> 0 bytes .../40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 | Bin 147 -> 0 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 126 -> 0 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 127 -> 0 bytes .../9a/cb41da3b683497b3966135ccd64411b8ef698f | Bin 147 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 | 2 - .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 30 -> 0 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 127 -> 0 bytes .../fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 | 2 - .../repo/.git_keep/refs/heads/branch2 | 1 - .../expected/repo/.git_keep/refs/heads/ma | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../reflogCheckout/expected/repo/file0 | 1 - .../reflogCheckout/expected/repo/file1 | 1 - .../reflogCheckout/expected/repo/file2 | 1 - .../reflogCheckout/expected/repo/file4 | 2 - .../integration/reflogCheckout/recording.json | 1 - test/integration/reflogCheckout/setup.sh | 40 ------ test/integration/reflogCheckout/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 334 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 12 -- .../repo/.git_keep/logs/refs/heads/branch2 | 4 - .../repo/.git_keep/logs/refs/heads/master | 5 - .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 36 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 24 -> 0 bytes .../35/bedc872b1ca9e026e51c4017416acba4b3d64b | 2 - .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 31 -> 0 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 127 -> 0 bytes .../43/12f3a59c644c52ad89254be43d7a7987e56bed | Bin 126 -> 0 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 126 -> 0 bytes .../5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 | 2 - .../71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 | 2 - .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 127 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a9/55e641b00e7e896842122a3537c70476d7b4e0 | Bin 148 -> 0 bytes .../ac/7b38400c8aed050f379f9643b953b9d428fda1 | 2 - .../af/eb127e4579981e4b852e8aabb44b07f2ea4e09 | Bin 148 -> 0 bytes .../bc/8891320172f4cfa3efd7bb8767a46daa200d79 | Bin 147 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd | Bin 147 -> 0 bytes .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 30 -> 0 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 127 -> 0 bytes .../repo/.git_keep/refs/heads/branch2 | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../reflogCherryPick/expected/repo/file0 | 1 - .../reflogCherryPick/expected/repo/file1 | 1 - .../reflogCherryPick/expected/repo/file2 | 2 - .../reflogCherryPick/expected/repo/file4 | 1 - .../reflogCherryPick/recording.json | 1 - test/integration/reflogCherryPick/setup.sh | 40 ------ test/integration/reflogCherryPick/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 353 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 9 -- .../repo/.git_keep/logs/refs/heads/branch2 | 5 - .../repo/.git_keep/logs/refs/heads/master | 4 - .../07/e795700fa240713f5577867a45eb6f2071d856 | Bin 148 -> 0 bytes .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 36 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 24 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 31 -> 0 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 127 -> 0 bytes .../44/5557afd2775df735bc53b891678e6bd9072638 | Bin 146 -> 0 bytes .../53/26459d9a0c196b18cc31dc95f05c9a4e4462de | Bin 146 -> 0 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 126 -> 0 bytes .../75/6e436bdd05b965c967edc1929432917e3864cd | 3 - .../7d/61d1707885895d92f021111196df4466347327 | Bin 147 -> 0 bytes .../86/3cae3fe21db864bc92b74ae4820e628e5eaf8b | Bin 127 -> 0 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 127 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b | Bin 119 -> 0 bytes .../b0/bf1c26d59a724c767948a6de15664bfc0c292f | 2 - .../c5/4d82926c7b673499d675aec8732cfe08aed761 | 3 - .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 30 -> 0 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 127 -> 0 bytes .../repo/.git_keep/refs/heads/branch2 | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../reflogCommitFiles/expected/repo/file0 | 1 - .../reflogCommitFiles/expected/repo/file1 | 1 - .../reflogCommitFiles/expected/repo/file2 | 2 - .../reflogCommitFiles/expected/repo/file4 | 2 - .../reflogCommitFiles/recording.json | 125 ------------------ test/integration/reflogCommitFiles/setup.sh | 40 ------ test/integration/reflogCommitFiles/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 353 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 9 -- .../repo/.git_keep/logs/refs/heads/branch2 | 5 - .../repo/.git_keep/logs/refs/heads/master | 4 - .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 36 -> 0 bytes .../16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 | 2 - .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 | 2 - .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../1f/d818af9eb65653e98def81168002cabc353b6a | Bin 147 -> 0 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 24 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 31 -> 0 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 127 -> 0 bytes .../3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 | Bin 148 -> 0 bytes .../49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 | Bin 119 -> 0 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 126 -> 0 bytes .../7c/03a659737f2cc728a2a572cedee98019bbd04b | Bin 147 -> 0 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 127 -> 0 bytes .../94/0576e482f2193afad72ea2205c05fd01507e1a | 4 - .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 30 -> 0 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 127 -> 0 bytes .../repo/.git_keep/refs/heads/branch2 | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../reflogHardReset/expected/repo/file0 | 1 - .../reflogHardReset/expected/repo/file1 | 1 - .../reflogHardReset/expected/repo/file2 | 1 - .../reflogHardReset/expected/repo/file4 | 2 - .../reflogHardReset/recording.json | 1 - test/integration/reflogHardReset/setup.sh | 40 ------ test/integration/reflogHardReset/test.json | 1 - 174 files changed, 227 insertions(+), 517 deletions(-) create mode 100644 pkg/integration/tests/reflog/checkout.go create mode 100644 pkg/integration/tests/reflog/cherry_pick.go create mode 100644 pkg/integration/tests/reflog/patch.go create mode 100644 pkg/integration/tests/reflog/reset.go delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/config delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/description delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/index delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/branch2 delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/ma delete mode 100644 test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/reflogCheckout/expected/repo/file0 delete mode 100644 test/integration/reflogCheckout/expected/repo/file1 delete mode 100644 test/integration/reflogCheckout/expected/repo/file2 delete mode 100644 test/integration/reflogCheckout/expected/repo/file4 delete mode 100644 test/integration/reflogCheckout/recording.json delete mode 100644 test/integration/reflogCheckout/setup.sh delete mode 100644 test/integration/reflogCheckout/test.json delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/config delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/description delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/index delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 delete mode 100644 test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/reflogCherryPick/expected/repo/file0 delete mode 100644 test/integration/reflogCherryPick/expected/repo/file1 delete mode 100644 test/integration/reflogCherryPick/expected/repo/file2 delete mode 100644 test/integration/reflogCherryPick/expected/repo/file4 delete mode 100644 test/integration/reflogCherryPick/recording.json delete mode 100644 test/integration/reflogCherryPick/setup.sh delete mode 100644 test/integration/reflogCherryPick/test.json delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/config delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/description delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/index delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/reflogCommitFiles/expected/repo/file0 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/file1 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/file2 delete mode 100644 test/integration/reflogCommitFiles/expected/repo/file4 delete mode 100644 test/integration/reflogCommitFiles/recording.json delete mode 100644 test/integration/reflogCommitFiles/setup.sh delete mode 100644 test/integration/reflogCommitFiles/test.json delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/config delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/description delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/index delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 delete mode 100644 test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/reflogHardReset/expected/repo/file0 delete mode 100644 test/integration/reflogHardReset/expected/repo/file1 delete mode 100644 test/integration/reflogHardReset/expected/repo/file2 delete mode 100644 test/integration/reflogHardReset/expected/repo/file4 delete mode 100644 test/integration/reflogHardReset/recording.json delete mode 100644 test/integration/reflogHardReset/setup.sh delete mode 100644 test/integration/reflogHardReset/test.json diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index df9988c2a..eaf9862d6 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -47,7 +47,10 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Commits.PasteCommits) - t.ExpectPopup().Alert().Title(Equals("Cherry-Pick")).Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).Confirm() + t.ExpectPopup().Alert(). + Title(Equals("Cherry-Pick")). + 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")). diff --git a/pkg/integration/tests/reflog/checkout.go b/pkg/integration/tests/reflog/checkout.go new file mode 100644 index 000000000..9307ab609 --- /dev/null +++ b/pkg/integration/tests/reflog/checkout.go @@ -0,0 +1,55 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Checkout = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Checkout a reflog commit as a detached head", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + PressPrimaryAction(). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Contains("checkout commit")). + Content(Contains("Are you sure you want to checkout this commit?")). + Confirm() + }). + TopLines( + Contains("checkout: moving from master to").IsSelected(), + Contains("reset: moving to HEAD^^"), + ) + + t.Views().Branches(). + Lines( + Contains("(HEAD detached at").IsSelected(), + Contains("master"), + ) + + t.Views().Commits(). + Focus(). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/reflog/cherry_pick.go b/pkg/integration/tests/reflog/cherry_pick.go new file mode 100644 index 000000000..cc7f503e2 --- /dev/null +++ b/pkg/integration/tests/reflog/cherry_pick.go @@ -0,0 +1,50 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Cherry pick a reflog commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + Press(keys.Commits.CherryPickCopy) + + t.Views().Information().Content(Contains("1 commit copied")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("one").IsSelected(), + ). + Press(keys.Commits.PasteCommits). + Tap(func() { + t.ExpectPopup().Alert(). + Title(Equals("Cherry-Pick")). + Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). + Confirm() + }). + Lines( + Contains("three").IsSelected(), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/reflog/patch.go b/pkg/integration/tests/reflog/patch.go new file mode 100644 index 000000000..568f36c43 --- /dev/null +++ b/pkg/integration/tests/reflog/patch.go @@ -0,0 +1,64 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Patch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Build a patch from a reflog commit and apply it", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.CreateFileAndAdd("file1", "content1") + shell.CreateFileAndAdd("file2", "content2") + shell.Commit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + PressEnter() + + t.Views().SubCommits(). + IsFocused(). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + Contains("file2"), + ). + PressPrimaryAction() + + t.Views().Information().Content(Contains("building patch")) + + t.Views(). + CommitFiles(). + Press(keys.Universal.CreatePatchOptionsMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Patch Options")). + Select(MatchesRegexp(`apply patch$`)).Confirm() + + t.Views().Files().Lines( + Contains("file1"), + ) + }, +}) diff --git a/pkg/integration/tests/reflog/reset.go b/pkg/integration/tests/reflog/reset.go new file mode 100644 index 000000000..80c11cbb7 --- /dev/null +++ b/pkg/integration/tests/reflog/reset.go @@ -0,0 +1,49 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Reset = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Hard reset to a reflog commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + Press(keys.Commits.ViewResetOptions). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Contains("reset to")). + Select(Contains("hard reset")). + Confirm() + }). + TopLines( + Contains("reset: moving to").IsSelected(), + Contains("reset: moving to HEAD^^"), + ) + + t.Views().Commits(). + Focus(). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 6a7e36373..a7cade4d4 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -17,6 +17,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/interactive_rebase" "github.com/jesseduffield/lazygit/pkg/integration/tests/misc" "github.com/jesseduffield/lazygit/pkg/integration/tests/patch_building" + "github.com/jesseduffield/lazygit/pkg/integration/tests/reflog" "github.com/jesseduffield/lazygit/pkg/integration/tests/stash" "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule" "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" @@ -87,6 +88,10 @@ var tests = []*components.IntegrationTest{ misc.ConfirmOnQuit, misc.InitialOpen, patch_building.CopyPatchToClipboard, + reflog.Checkout, + reflog.CherryPick, + reflog.Patch, + reflog.Reset, stash.Apply, stash.ApplyPatch, stash.CreateBranch, diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/HEAD deleted file mode 100644 index 63e0b0bf0..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/ma diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/config b/test/integration/reflogCheckout/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/description b/test/integration/reflogCheckout/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogCheckout/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/reflogCheckout/expected/repo/.git_keep/index b/test/integration/reflogCheckout/expected/repo/.git_keep/index deleted file mode 100644 index 6f3c8c4714d1ec4a722867ac3050fa805d47ed03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmW1plX{yzq-@<4{pctE8uoMGB;}Ql2#;-s%B0$V$A!2o9!9T5S z?}87#?_7HG(cY=1w-{K{GILT5fYJ;MApL5KT3KN<)Eq-}bC<{8u&g#+QiDD4u+$ z3jtm&-B%&z0F^?_$+luSd>CjBn1-6O0Nor3o*zaHO8d^eT(u~?s=wux_IwLbH}O?Hy%+V^T={nSorfu{_A*jlqW8Q+&mBLv>fsLntMzk^ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/info/exclude b/test/integration/reflogCheckout/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/reflogCheckout/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/reflogCheckout/expected/repo/.git_keep/logs/HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 6fcc2f198..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI 1617683558 +1000 commit (initial): file0 -2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI 1617683558 +1000 commit: file1 -9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI 1617683558 +1000 commit: file2 -40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 commit: file4 -ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 checkout: moving from master to branch2 -ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683558 +1000 commit: file4 -fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI 1617683558 +1000 commit: file4 -37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI 1617683558 +1000 commit: file2 -10e005e1fa2db07721aa63cb048b87b7a2830b64 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683563 +1000 checkout: moving from branch2 to fdc461cdae46cbcd0e8b -fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683567 +1000 checkout: moving from fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 to ma diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 071cb8406..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 branch: Created from HEAD -ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683558 +1000 commit: file4 -fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI 1617683558 +1000 commit: file4 -37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI 1617683558 +1000 commit: file2 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma deleted file mode 100644 index 4d6ce4df1..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683567 +1000 branch: Created from fdc461c diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 331bd0c7a..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI 1617683558 +1000 commit (initial): file0 -2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI 1617683558 +1000 commit: file1 -9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI 1617683558 +1000 commit: file2 -40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 commit: file4 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2c4712a28ba59b99a0ddd33f70433acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 deleted file mode 100644 index 1e1c0fb3909c296c4ec49e761a1996b2b4de1525..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fDMP26<*$XmBnwbfR2wn9UlXQZG)|L{%%L^UJ<% zOS3NdOFLDq5@GaSif2Zcy=K9xiK`4%W+bJ=gG*u#IrZIaAVfzgNJoJp1;`w8Dj^2| zm%89uFc|r?*M8b@viEU%>Q}a7)mz!Ohjo1cImF2J>HxrW+fOz9GdFcv)tevnUO08m CutsD6 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 deleted file mode 100644 index 7dc2d466cea3d7df9b09b2bf12ef0c9358bb1ac0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10gcT~3c@fDKw;N8#q0%{Nhd!8B0^U^M$$~M&=4sRJia}G+s6lQ?X7JC zi1{)ORUnObj5R$!ubIzRhoa*{#ZtAk?V1B+oIv^h_ BMtT4M diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb|y2)08mZ`J^%m! diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7c0189f1a7f6fc780332ce07230ba16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 deleted file mode 100644 index 2f6201ab7d8799af803ce62b6ec5f40255c99bd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)*$a}%cLE|pS3O2DGr>Y*ONrp|?GfBQ9*;*`@5|7T z?PVMyItyY+h6x!hvn{PQ4hB+`mQVoEx=NPRUJiK=oeNbDTwIOld`{Kn7{LW1j@|=Q zlom5KRX*dj9eSGeeVU*0Eq!0*Mq7Vqh-V&M2&k`Mj8P{&r-uBgtG29S)epbAIqO?$ BKg0k4 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed50454974ab7775c9d85cee55477580ac83e835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335181ed440a54f52297d3cb1ab3a70222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f deleted file mode 100644 index b310aa841ae01f8d9c6ad610445d9580fee628ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcX03c@fDKw;N8MfQTs=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCheckout/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/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 deleted file mode 100644 index b7e0a5cab..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9EL~&U1IfR"x|{o궮sn~X$b}KB%z!n#HPEfp0vqqzʗ}[ևuD99Ont^$: \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee261a5c479d905ee8318e897bf4bca8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb~-q%PKJUL9GL*(lMbH% diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3f282798a9dd14ae1222a66d0c4a783a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 deleted file mode 100644 index 72227f67d..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0FaYE file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogCheckout/test.json b/test/integration/reflogCheckout/test.json deleted file mode 100644 index 40f23e49c..000000000 --- a/test/integration/reflogCheckout/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "checking out a commit in the reflog context", "speed": 10 } diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 9a97fa86f..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -afeb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/config b/test/integration/reflogCherryPick/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/description b/test/integration/reflogCherryPick/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogCherryPick/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/reflogCherryPick/expected/repo/.git_keep/index b/test/integration/reflogCherryPick/expected/repo/.git_keep/index deleted file mode 100644 index 913dfd5807f1d16cff8615c11888f76ff9fe067e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmZ?q402{*U|<4bmW1plGkI&~y@JtsHo3nJ!Angv#}H=DV##@Bmx1PhX^1)D?P%ukTd!Jfv}4|tEUAy1e0lw>dx}dlyddTn z!OWQ@Rc84RXbzZ$nv;WO4yP`|-hjx$6?=*$ZuT))y({Q4t7(OpV*)lOB*@hj$Y5j8 eHB>O*a`?w>;hkN6bNbU5nHkDuw}lMf836#id1@vA diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/info/exclude b/test/integration/reflogCherryPick/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/reflogCherryPick/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/reflogCherryPick/expected/repo/.git_keep/logs/HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index a2378d782..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,12 +0,0 @@ -0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI 1617683609 +1000 commit (initial): file0 -5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI 1617683609 +1000 commit: file1 -713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI 1617683609 +1000 commit: file2 -e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 commit: file4 -afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 checkout: moving from master to branch2 -afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI 1617683609 +1000 commit: file4 -ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI 1617683609 +1000 commit: file4 -a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI 1617683609 +1000 commit: file2 -bc8891320172f4cfa3efd7bb8767a46daa200d79 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683610 +1000 checkout: moving from branch2 to master -afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683619 +1000 rebase -i (start): checkout HEAD -afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (pick): file2 -35bedc872b1ca9e026e51c4017416acba4b3d64b 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index fc6af3173..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 branch: Created from HEAD -afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI 1617683609 +1000 commit: file4 -ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI 1617683609 +1000 commit: file4 -a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI 1617683609 +1000 commit: file2 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 7d698f8ae..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI 1617683609 +1000 commit (initial): file0 -5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI 1617683609 +1000 commit: file1 -713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI 1617683609 +1000 commit: file2 -e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 commit: file4 -afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (finish): refs/heads/master onto afeb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2c4712a28ba59b99a0ddd33f70433acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258e5362e874f0cd17fc6c260a82c41501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb|y2)08mZ`J^%m! diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7c0189f1a7f6fc780332ce07230ba16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed deleted file mode 100644 index a8e70c668ec079128c53032aaae858744b7befc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX g6qqpRGVBeAEL^dtSmI_MgVno&F0-0e07XYPa?B+;V*mgE diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed50454974ab7775c9d85cee55477580ac83e835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 deleted file mode 100644 index ed4c460f1..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9IIDz`!Dn?j];f@69=Hdc*\Ч\+wi4mi $d۟ܕu3t?8+ \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 deleted file mode 100644 index 254d31eaa..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] Ϥ"BW=$`Dv֮쥟"9SΆ83ⰦB-N3ɣu)buS*S($!T/hS/c[CBɡ!}c I9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335181ed440a54f52297d3cb1ab3a70222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06dda15fe1901a7942e7954b700b36bfa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCherryPick/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/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 deleted file mode 100644 index f1acbc48fa2034f2bd8ee00b9e1ce24a24d34ccb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0ga9^3d1lA06Y5?-U~&t9NU6Y3Yqc@*_LS_X+m(J&u^a4;g;iuE8Dux z-6Fe7KU6K%>>z~}6J#tckW(#=5m6iQz(|rLyKHtj^xdtLm??RHl0+*E&?s`_;3@NP zQoT#93L5$J*LK)(viEU%>Q~l%(OcQphsA&~BnrUxiU43vdro!zGdFEs)SDk%Dmi2A CW=3HE diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 deleted file mode 100644 index 28711d3e7..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0FaYEq./[Jo NZ[] br&"AAb }r^|5(RIYHL`OmF}'Ѧ}4E_1FyYA:! \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 deleted file mode 100644 index 3861432eb475d4e062bc68b827c76d3da3f7675e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSZ@;d<$p{pKaGMQkZv86=t`1S~HAK&8f*84Iv zWP2Hhhz^;Ia7F?2i7DC2E|f$C3;GspDv_E+qjoyvJ+xS7gR9UGoC5*Qo&tpyQEc_h zz(vHis^~Lb+o7jf->3O0U+ViRH{SX~LxdF3MU(Xvj4|r0=hTotxoXQQUi|>IZaO7M CiAXj8 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 deleted file mode 100644 index 97cea45095fd458d1d3f947581c9f36071a919a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaBq3WG2Z1$)j{xZ0kBV z>$1PJ1F#U`=)D%764T@{Dp%xGHB_BgAUOq>)$DrU-K^#q!NHA05Twj0cz5<)?4$?< z;Yr2-GWuz+?Xdk|@BQ$^SJ!>Pt!(SVI(EXTW6JjGh{&AuoND+}H+5d%%?}{RIK$Ck BO<@24 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd deleted file mode 100644 index 557ada37edeac16958d896533a3c776ae59bc3fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)vlk@)Oh82Fs>euYCRk`pDG@xrJ%ZcE~-q%PKJUL9GL*(lMbH% diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3f282798a9dd14ae1222a66d0c4a783a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index bd45e4cdd..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -bc8891320172f4cfa3efd7bb8767a46daa200d79 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master b/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 255e95bd9..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -35bedc872b1ca9e026e51c4017416acba4b3d64b diff --git a/test/integration/reflogCherryPick/expected/repo/file0 b/test/integration/reflogCherryPick/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/reflogCherryPick/expected/repo/file1 b/test/integration/reflogCherryPick/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/reflogCherryPick/expected/repo/file2 b/test/integration/reflogCherryPick/expected/repo/file2 deleted file mode 100644 index 3baaa732b..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file2 +++ /dev/null @@ -1,2 +0,0 @@ -test2 -line two diff --git a/test/integration/reflogCherryPick/expected/repo/file4 b/test/integration/reflogCherryPick/expected/repo/file4 deleted file mode 100644 index 2d00bd505..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -line one diff --git a/test/integration/reflogCherryPick/recording.json b/test/integration/reflogCherryPick/recording.json deleted file mode 100644 index aa6a25783..000000000 --- a/test/integration/reflogCherryPick/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":574,"Mod":0,"Key":259,"Ch":0},{"Timestamp":829,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1029,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2773,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4325,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4933,"Mod":0,"Key":256,"Ch":93},{"Timestamp":6029,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7524,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8861,"Mod":0,"Key":256,"Ch":91},{"Timestamp":9613,"Mod":0,"Key":256,"Ch":118},{"Timestamp":9974,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10837,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogCherryPick/setup.sh b/test/integration/reflogCherryPick/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/reflogCherryPick/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogCherryPick/test.json b/test/integration/reflogCherryPick/test.json deleted file mode 100644 index 01c3dcbd4..000000000 --- a/test/integration/reflogCherryPick/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "cherry-picking a commit from the reflog context", "speed": 10 } diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD deleted file mode 100644 index 1d57c9ea7..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/branch2 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/config b/test/integration/reflogCommitFiles/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/description b/test/integration/reflogCommitFiles/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogCommitFiles/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/reflogCommitFiles/expected/repo/.git_keep/index b/test/integration/reflogCommitFiles/expected/repo/.git_keep/index deleted file mode 100644 index 1f9535e1a633cd1094e85971cca1944f9e826845..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmW1r5{KoTgp2BEGpctE8>|O?j#w834j9-CjM1YvhLd5FIf`3}u z-UT0e-?{YWqrFp2Z!xf@W#*(B0HqliK>AINt!;wQP;;)Jo3nJ!Angv#}ICgwUo^%kU1b4YR*$MbNH=SEjQXR?@E@`$4$Pxe%3w3r5RojbBti- zhzewXO97e#rXl9U0sW2QFQKPLk4D&gF7|6Xm!utOX8Us<=apj+b4L{?)q}$ 1617683727 +1000 commit (initial): file0 -a6cc56fedc3f0fc234dcacef1f1de2706c32c44b 7d61d1707885895d92f021111196df4466347327 CI 1617683727 +1000 commit: file1 -7d61d1707885895d92f021111196df4466347327 c54d82926c7b673499d675aec8732cfe08aed761 CI 1617683727 +1000 commit: file2 -c54d82926c7b673499d675aec8732cfe08aed761 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 commit: file4 -445557afd2775df735bc53b891678e6bd9072638 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 checkout: moving from master to branch2 -445557afd2775df735bc53b891678e6bd9072638 756e436bdd05b965c967edc1929432917e3864cd CI 1617683727 +1000 commit: file4 -756e436bdd05b965c967edc1929432917e3864cd 07e795700fa240713f5577867a45eb6f2071d856 CI 1617683727 +1000 commit: file4 -07e795700fa240713f5577867a45eb6f2071d856 5326459d9a0c196b18cc31dc95f05c9a4e4462de CI 1617683728 +1000 commit: file2 -5326459d9a0c196b18cc31dc95f05c9a4e4462de b0bf1c26d59a724c767948a6de15664bfc0c292f CI 1617683735 +1000 commit: asd diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 222df85dc..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 branch: Created from HEAD -445557afd2775df735bc53b891678e6bd9072638 756e436bdd05b965c967edc1929432917e3864cd CI 1617683727 +1000 commit: file4 -756e436bdd05b965c967edc1929432917e3864cd 07e795700fa240713f5577867a45eb6f2071d856 CI 1617683727 +1000 commit: file4 -07e795700fa240713f5577867a45eb6f2071d856 5326459d9a0c196b18cc31dc95f05c9a4e4462de CI 1617683728 +1000 commit: file2 -5326459d9a0c196b18cc31dc95f05c9a4e4462de b0bf1c26d59a724c767948a6de15664bfc0c292f CI 1617683735 +1000 commit: asd diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 2d7aeb3dd..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 a6cc56fedc3f0fc234dcacef1f1de2706c32c44b CI 1617683727 +1000 commit (initial): file0 -a6cc56fedc3f0fc234dcacef1f1de2706c32c44b 7d61d1707885895d92f021111196df4466347327 CI 1617683727 +1000 commit: file1 -7d61d1707885895d92f021111196df4466347327 c54d82926c7b673499d675aec8732cfe08aed761 CI 1617683727 +1000 commit: file2 -c54d82926c7b673499d675aec8732cfe08aed761 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 commit: file4 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 deleted file mode 100644 index d5890a18808d81cf7cb560ab233abe0bdb935110..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAJ3Iib!1+(@P?gPQLwN(fqFsnI+pOy@aaTpBb`0)tYKB|hBdu!W} z5cFl7%o0n|%2Rb-CCHUfGiMzDfGY+Y0HcpdCvn7+-$Ob}Y>-kZ%BDaz2Xb8U>;;3< zbBvx$E+T%$tDkaN<$YP7{Eh9{`IdWoNFZ?J(P<~Ipp+7Gou>x>iHo}JY{U;Fi8$=J CuSA#t diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2c4712a28ba59b99a0ddd33f70433acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258e5362e874f0cd17fc6c260a82c41501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb|y2)08mZ`J^%m! diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7c0189f1a7f6fc780332ce07230ba16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 deleted file mode 100644 index 942c4cb98b714b533502785ddcc1ded38dbd557b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaAJ3c@fDKwak)*$a~YOh82Fs>hg2CRk`}DG@xrJ%Zc!-s17r`!cl6 z?lKM$9Wxo>jAAhW6S&Gg7NCL!LyHbdqUO-3oep^q%`sGT*(E*=_>gl=5J?!pJ8oi- zq(ZWaKI63=dYbipnxFEezOQoQtv|F)77}`Jps&^#qfUBG4f!)yZCNF#A97HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd deleted file mode 100644 index 11a1c2730..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$L -"BW=$bDn+[kK7K?T!)lKX9QDB[eQJ!fCér"'} ȧ ԯ}[\tYe:k99O˪h~U9 \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 deleted file mode 100644 index ce7286748dca7f7eede81b003b14c73e87532d08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MfQTsB&goh>g#_X9}zI{=`y BM-%`6 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b deleted file mode 100644 index 61445855a46a03499ed9c9cf90d1b5cf871bc2cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqnPJ$f|4-gB{E+qop|NHg1?^Ej^@0{~nMIOYXSIq?7h diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335181ed440a54f52297d3cb1ab3a70222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06dda15fe1901a7942e7954b700b36bfa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCommitFiles/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/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b deleted file mode 100644 index d86c14ae8f3533497590af7edfa9d0b8d96446b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10gcT;3c@fDMq$@E#q0%{NynrC5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lDl^?3&3M4TG*ysY=8z;YvQNB+drapK)L Zc~-q%PKJUL9GL*(lMbH% diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3f282798a9dd14ae1222a66d0c4a783a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index c47bc95c8..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -b0bf1c26d59a724c767948a6de15664bfc0c292f diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master b/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 7cfd9a220..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -445557afd2775df735bc53b891678e6bd9072638 diff --git a/test/integration/reflogCommitFiles/expected/repo/file0 b/test/integration/reflogCommitFiles/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/reflogCommitFiles/expected/repo/file1 b/test/integration/reflogCommitFiles/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/reflogCommitFiles/expected/repo/file2 b/test/integration/reflogCommitFiles/expected/repo/file2 deleted file mode 100644 index 3baaa732b..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file2 +++ /dev/null @@ -1,2 +0,0 @@ -test2 -line two diff --git a/test/integration/reflogCommitFiles/expected/repo/file4 b/test/integration/reflogCommitFiles/expected/repo/file4 deleted file mode 100644 index e5c5c5583..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file4 +++ /dev/null @@ -1,2 +0,0 @@ -line one -line two diff --git a/test/integration/reflogCommitFiles/recording.json b/test/integration/reflogCommitFiles/recording.json deleted file mode 100644 index 8339b7ea7..000000000 --- a/test/integration/reflogCommitFiles/recording.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "KeyEvents": [ - { - "Timestamp": 608, - "Mod": 0, - "Key": 259, - "Ch": 0 - }, - { - "Timestamp": 768, - "Mod": 0, - "Key": 259, - "Ch": 0 - }, - { - "Timestamp": 1376, - "Mod": 0, - "Key": 256, - "Ch": 93 - }, - { - "Timestamp": 1817, - "Mod": 0, - "Key": 258, - "Ch": 0 - }, - { - "Timestamp": 2560, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 2860, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 3271, - "Mod": 0, - "Key": 256, - "Ch": 32 - }, - { - "Timestamp": 3936, - "Mod": 2, - "Key": 16, - "Ch": 16 - }, - { - "Timestamp": 4680, - "Mod": 0, - "Key": 258, - "Ch": 0 - }, - { - "Timestamp": 4945, - "Mod": 0, - "Key": 258, - "Ch": 0 - }, - { - "Timestamp": 5216, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 5712, - "Mod": 0, - "Key": 260, - "Ch": 0 - }, - { - "Timestamp": 5952, - "Mod": 0, - "Key": 260, - "Ch": 0 - }, - { - "Timestamp": 6191, - "Mod": 0, - "Key": 256, - "Ch": 99 - }, - { - "Timestamp": 6456, - "Mod": 0, - "Key": 256, - "Ch": 97 - }, - { - "Timestamp": 6536, - "Mod": 0, - "Key": 256, - "Ch": 115 - }, - { - "Timestamp": 6647, - "Mod": 0, - "Key": 256, - "Ch": 100 - }, - { - "Timestamp": 6968, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 7376, - "Mod": 0, - "Key": 256, - "Ch": 113 - } - ], - "ResizeEvents": [ - { - "Timestamp": 0, - "Width": 272, - "Height": 74 - } - ] -} diff --git a/test/integration/reflogCommitFiles/setup.sh b/test/integration/reflogCommitFiles/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/reflogCommitFiles/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogCommitFiles/test.json b/test/integration/reflogCommitFiles/test.json deleted file mode 100644 index df7ad6e19..000000000 --- a/test/integration/reflogCommitFiles/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Accessing commit files of a reflog entry", "speed": 10 } diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/HEAD deleted file mode 100644 index 1d57c9ea7..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/branch2 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 000eb0200..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -1fd818af9eb65653e98def81168002cabc353b6a diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/config b/test/integration/reflogHardReset/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/description b/test/integration/reflogHardReset/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogHardReset/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/reflogHardReset/expected/repo/.git_keep/index b/test/integration/reflogHardReset/expected/repo/.git_keep/index deleted file mode 100644 index fcbfa4ccfb13130e9b4f303f669a98d41ff489f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmW1plPjv2R2E%AZpctE8)GG#t#w834j9-CjM1YvhLd5FIf`3}u z-UT0e-?{YWqrFp2Z!xf@W#*(B0HqliK>GFgIfY;}#GGg#g=)^yJ&*sYrr!7x5gNsl z?{p!+tEKxY#2iDIIWINMS@r_W0n<=(a?#C^;Q3+HptSGY%TAk4O=E~}A^DlCjG47n;ARfs)*VW$A&U+aE^gD1+ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/info/exclude b/test/integration/reflogHardReset/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/reflogHardReset/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/reflogHardReset/expected/repo/.git_keep/logs/HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 4b553fd32..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 496408d5ed7b1edff760bf2ce56a43b9fab737e0 CI 1617683684 +1000 commit (initial): file0 -496408d5ed7b1edff760bf2ce56a43b9fab737e0 940576e482f2193afad72ea2205c05fd01507e1a CI 1617683684 +1000 commit: file1 -940576e482f2193afad72ea2205c05fd01507e1a 1883828474eb5bac8cb27c8a7a3614f9ea3137a0 CI 1617683684 +1000 commit: file2 -1883828474eb5bac8cb27c8a7a3614f9ea3137a0 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 commit: file4 -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 checkout: moving from master to branch2 -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683684 +1000 commit: file4 -3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 7c03a659737f2cc728a2a572cedee98019bbd04b CI 1617683684 +1000 commit: file4 -7c03a659737f2cc728a2a572cedee98019bbd04b 1fd818af9eb65653e98def81168002cabc353b6a CI 1617683684 +1000 commit: file2 -1fd818af9eb65653e98def81168002cabc353b6a 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683689 +1000 reset: moving to 3e0b28f0bcdd445c5f6d diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 558ce9a6b..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 branch: Created from HEAD -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683684 +1000 commit: file4 -3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 7c03a659737f2cc728a2a572cedee98019bbd04b CI 1617683684 +1000 commit: file4 -7c03a659737f2cc728a2a572cedee98019bbd04b 1fd818af9eb65653e98def81168002cabc353b6a CI 1617683684 +1000 commit: file2 -1fd818af9eb65653e98def81168002cabc353b6a 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683689 +1000 reset: moving to 3e0b28f0bcdd445c5f6d diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 11f14b24e..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 496408d5ed7b1edff760bf2ce56a43b9fab737e0 CI 1617683684 +1000 commit (initial): file0 -496408d5ed7b1edff760bf2ce56a43b9fab737e0 940576e482f2193afad72ea2205c05fd01507e1a CI 1617683684 +1000 commit: file1 -940576e482f2193afad72ea2205c05fd01507e1a 1883828474eb5bac8cb27c8a7a3614f9ea3137a0 CI 1617683684 +1000 commit: file2 -1883828474eb5bac8cb27c8a7a3614f9ea3137a0 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 commit: file4 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2c4712a28ba59b99a0ddd33f70433acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 deleted file mode 100644 index a6ae1480f..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] LU1'Xhl)<9{xomfw駈pF ܓ},@ DաQ!G7 %b‑|f!o=Qyyȗڱɍv6YH}5IP?oK9x \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 deleted file mode 100644 index 471870fd2..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E] 23i ]dƖ#ium#]کj2K83LR=`Vd&$JS|gS!N@*D=E1ilԯc[Fjnʺ)H9 \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a deleted file mode 100644 index c4caad22e66ccc75891acae3891ffc6ccda770f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93d0}}0DJZodoL8-m|cZZ3OVH&tFANV>oS1H8GF?bin>~iS417|x3jgbegm@{J#l#wxO(KE9y zrc|s?Mn3(u9Wc#spXR52rR}TU^41>U$T5Y1f`_ZK)|!)^Q(gbmOn BN9X_m diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258e5362e874f0cd17fc6c260a82c41501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb|y2)08mZ`J^%m! diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7c0189f1a7f6fc780332ce07230ba16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 deleted file mode 100644 index a98e469b92ad57632c6f4993758ac24ac038d5ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAL3c@fDMqTF=*$XmBCO<+Ep{pKalFVSCv86=t_~r<1Ki+$MWp8cm z+T87>pUgTjmJFr(P-F6$5Ydv)7B~|7%AVM{Xq`If|ak CoJWiR diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 deleted file mode 100644 index 7d29a095932f81310bc8ab5c71ce232f0f7d8cc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10gcT;3c@fDMq$@E#q0%{NynrC5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lDl^?3&3M4TG*ysY=8z;YvQNB+drapK)L ZxKZgU%xunjPCEYNrmP#-`~coBEB>x6I!6Ei diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed50454974ab7775c9d85cee55477580ac83e835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b deleted file mode 100644 index 75304b52b9b786f665436c5e1d825ca00da4c4d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAJ3d0}}K)d!7?hC~kb)ry8A*&q2&kPO3CIkyTemz3BkN4n}y|uM# zh2LY4A}r{qvb zhV3m?RO!=S`>E$e-{7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a deleted file mode 100644 index 65f78d291..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a +++ /dev/null @@ -1,4 +0,0 @@ -xM -0@a9tҀU1LR"x|{odkm`C -FI"X]TDNC-^G -)PfCBcl suq9UGEßfOSUoXFOcEDsseUk~n:` \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06dda15fe1901a7942e7954b700b36bfa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogHardReset/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/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee261a5c479d905ee8318e897bf4bca8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb~-q%PKJUL9GL*(lMbH% diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3f282798a9dd14ae1222a66d0c4a783a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index 9a9e37446..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master b/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index ebc65e0dd..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 diff --git a/test/integration/reflogHardReset/expected/repo/file0 b/test/integration/reflogHardReset/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/reflogHardReset/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/reflogHardReset/expected/repo/file1 b/test/integration/reflogHardReset/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/reflogHardReset/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/reflogHardReset/expected/repo/file2 b/test/integration/reflogHardReset/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/reflogHardReset/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/reflogHardReset/expected/repo/file4 b/test/integration/reflogHardReset/expected/repo/file4 deleted file mode 100644 index e5c5c5583..000000000 --- a/test/integration/reflogHardReset/expected/repo/file4 +++ /dev/null @@ -1,2 +0,0 @@ -line one -line two diff --git a/test/integration/reflogHardReset/recording.json b/test/integration/reflogHardReset/recording.json deleted file mode 100644 index d0ea679cd..000000000 --- a/test/integration/reflogHardReset/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1017,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1296,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1857,"Mod":0,"Key":256,"Ch":93},{"Timestamp":2360,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2680,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3928,"Mod":0,"Key":256,"Ch":103},{"Timestamp":4296,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4448,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4752,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5656,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogHardReset/setup.sh b/test/integration/reflogHardReset/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/reflogHardReset/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogHardReset/test.json b/test/integration/reflogHardReset/test.json deleted file mode 100644 index 84304a953..000000000 --- a/test/integration/reflogHardReset/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Hard resetting to commit in the reflog", "speed": 10 } From eabe7f462a1f950d05b66306c19a00855e3fa175 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Feb 2023 21:57:32 +1100 Subject: [PATCH 2/3] migrate more tests --- pkg/integration/components/prompt_driver.go | 3 +- pkg/integration/components/search_driver.go | 39 +++++++ pkg/integration/components/shell.go | 2 +- pkg/integration/components/test_driver.go | 13 +++ pkg/integration/components/views.go | 4 + .../tests/branch/reset_upstream.go | 36 ++++++ pkg/integration/tests/branch/set_upstream.go | 40 +++++++ pkg/integration/tests/commit/reset_author.go | 39 +++++++ pkg/integration/tests/commit/search.go | 107 ++++++++++++++++++ pkg/integration/tests/commit/set_author.go | 51 +++++++++ pkg/integration/tests/staging/search.go | 42 +++++++ pkg/integration/tests/tests_gen.go | 7 ++ .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../resetAuthor/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../resetAuthor/expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 3 - .../repo/.git_keep/logs/refs/heads/master | 3 - .../07/14eb875f11c56a2dc8c53c148889fe43602349 | Bin 150 -> 0 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../29/1bcc7e708303b395f52245ec988ddbc985bae3 | 2 - .../63/aff3f0f54955ea149f9c2f3c07697b8864940d | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../resetAuthor/expected/repo/myfile1 | 1 - .../resetAuthor/expected/repo/myfile2 | 1 - test/integration/resetAuthor/recording.json | 1 - test/integration/resetAuthor/setup.sh | 20 ---- test/integration/resetAuthor/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../searching/expected/repo/.git_keep/HEAD | 1 - .../searching/expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../searching/expected/repo/.git_keep/index | Bin 353 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 5 - .../repo/.git_keep/logs/refs/heads/master | 5 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../33/f3da8081c87015eb5b43b148362af87ce6011c | Bin 129 -> 0 bytes .../3e/c60bb22aa39d08428e57e3251563f797b40fc8 | Bin 146 -> 0 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 21 -> 0 bytes .../5f/b9c54526790a11246b733354bf896da8ffc09d | 2 - .../6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 | 2 - .../fc/759ce6e48e0012eab3f02ec3524a55be938dd5 | Bin 149 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../searching/expected/repo/myfile1 | 1 - .../searching/expected/repo/myfile3 | 1 - .../searching/expected/repo/myfile4 | 1 - .../searching/expected/repo/myfile5 | 1 - test/integration/searching/recording.json | 1 - test/integration/searching/setup.sh | 24 ---- test/integration/searching/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 137 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 2 - .../repo/.git_keep/logs/refs/heads/master | 2 - .../16/4d8eaeabbb4b1082fdfb6735be0134535340b2 | Bin 52 -> 0 bytes .../36/4e6307f708c6f17d83c7309aaf9a3034210236 | Bin 145 -> 0 bytes .../4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 | Bin 52 -> 0 bytes .../70/dcf03faa734af0278690e1b0f8e767b733d88a | 2 - .../88/4971c742724377080ba3d75d4b4d6bceee4e4b | Bin 26 -> 0 bytes .../89/b24ecec50c07aef0d6640a2a9f6dc354a33125 | Bin 22 -> 0 bytes .../9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 | Bin 32 -> 0 bytes .../a9/2d664bc20a04b1621b1fc893d1196b41182fdf | Bin 29 -> 0 bytes .../cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 | Bin 29 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/myfile1 | 4 - .../searchingInStagingPanel/recording.json | 1 - .../searchingInStagingPanel/setup.sh | 18 --- .../searchingInStagingPanel/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../setAuthor/expected/repo/.git_keep/HEAD | 1 - .../setAuthor/expected/repo/.git_keep/config | 10 -- .../expected/repo/.git_keep/description | 1 - .../setAuthor/expected/repo/.git_keep/index | Bin 281 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 4 - .../repo/.git_keep/logs/refs/heads/master | 4 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../20/75aeb39a2a66a9607860a65b2a71c517760254 | 2 - .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../87/10ece70b7db9638b9645e93abdbcf210fa4595 | Bin 149 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ba/f3189129ba8878ba9b4107eaaaf3389287259b | Bin 157 -> 0 bytes .../d0/1c8bb001458d0a7c01193813685c658e0355ac | Bin 150 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../setAuthor/expected/repo/myfile1 | 1 - .../setAuthor/expected/repo/myfile2 | 1 - .../setAuthor/expected/repo/myfile3 | 1 - test/integration/setAuthor/recording.json | 1 - test/integration/setAuthor/setup.sh | 24 ---- test/integration/setAuthor/test.json | 4 - .../setUpstream/expected/origin/HEAD | 1 - .../setUpstream/expected/origin/config | 6 - .../setUpstream/expected/origin/description | 1 - .../setUpstream/expected/origin/info/exclude | 6 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf | Bin 149 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../6d/51185514ab4f80b42f17013295c261f92a66f0 | Bin 148 -> 0 bytes .../9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 | 3 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ce/3220d7b3cbc57811e3e6169349c611f62a7c42 | Bin 151 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../setUpstream/expected/origin/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../setUpstream/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 14 --- .../expected/repo/.git_keep/description | 1 - .../setUpstream/expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 5 - .../repo/.git_keep/logs/refs/heads/master | 5 - .../.git_keep/logs/refs/remotes/origin/master | 1 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf | Bin 149 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../6d/51185514ab4f80b42f17013295c261f92a66f0 | Bin 148 -> 0 bytes .../9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 | 3 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../ce/3220d7b3cbc57811e3e6169349c611f62a7c42 | Bin 151 -> 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 - .../setUpstream/expected/repo/myfile1 | 1 - .../setUpstream/expected/repo/myfile2 | 1 - test/integration/setUpstream/recording.json | 1 - test/integration/setUpstream/setup.sh | 32 ------ test/integration/setUpstream/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 .../30/ef3df33d31f0b98298881be4dbe69c54758ba2 | Bin 149 -> 0 bytes .../63/05259d1908bee46b3b686702ed55b6f12e9ba2 | 2 - .../a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 | 4 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../c6/ffcbed8902934d462722ff6ef471813b9a4df5 | 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 | 16 --- .../expected/repo/.git_keep/description | 1 - .../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 | 6 - .../.git_keep/logs/refs/remotes/origin/master | 1 - .../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/ef3df33d31f0b98298881be4dbe69c54758ba2 | Bin 149 -> 0 bytes .../63/05259d1908bee46b3b686702ed55b6f12e9ba2 | 2 - .../a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 | 4 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../c6/ffcbed8902934d462722ff6ef471813b9a4df5 | Bin 149 -> 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 - .../expected/repo/myfile1 | 1 - .../expected/repo/myfile2 | 1 - .../expected/repo/myfile3 | 1 - .../expected/repo/myfile4 | 1 - .../setUpstreamThroughPush/recording.json | 1 - .../setUpstreamThroughPush/setup.sh | 32 ------ .../setUpstreamThroughPush/test.json | 1 - .../unsetUpstream/expected/origin/HEAD | 1 - .../unsetUpstream/expected/origin/config | 6 - .../unsetUpstream/expected/origin/description | 1 - .../expected/origin/info/exclude | 6 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../24/351b001b63ca15b6b83542ffb765567e17df23 | Bin 147 -> 0 bytes .../28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 | 3 - .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../70/10e33e20178a1a179853948691a9036d48e562 | Bin 149 -> 0 bytes .../99/4a4733eacc0000721e01a177704e2f26216510 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../unsetUpstream/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 | 11 -- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 5 - .../repo/.git_keep/logs/refs/heads/master | 5 - .../.git_keep/logs/refs/remotes/origin/master | 1 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../24/351b001b63ca15b6b83542ffb765567e17df23 | Bin 147 -> 0 bytes .../28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 | 3 - .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../70/10e33e20178a1a179853948691a9036d48e562 | Bin 149 -> 0 bytes .../99/4a4733eacc0000721e01a177704e2f26216510 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 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 - .../unsetUpstream/expected/repo/myfile1 | 1 - .../unsetUpstream/expected/repo/myfile2 | 1 - test/integration/unsetUpstream/recording.json | 1 - test/integration/unsetUpstream/setup.sh | 36 ------ test/integration/unsetUpstream/test.json | 1 - 258 files changed, 380 insertions(+), 548 deletions(-) create mode 100644 pkg/integration/components/search_driver.go create mode 100644 pkg/integration/tests/branch/reset_upstream.go create mode 100644 pkg/integration/tests/branch/set_upstream.go create mode 100644 pkg/integration/tests/commit/reset_author.go create mode 100644 pkg/integration/tests/commit/search.go create mode 100644 pkg/integration/tests/commit/set_author.go create mode 100644 pkg/integration/tests/staging/search.go delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/config delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/description delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/index delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/objects/07/14eb875f11c56a2dc8c53c148889fe43602349 delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3 delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/resetAuthor/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/resetAuthor/expected/repo/myfile1 delete mode 100644 test/integration/resetAuthor/expected/repo/myfile2 delete mode 100644 test/integration/resetAuthor/recording.json delete mode 100644 test/integration/resetAuthor/setup.sh delete mode 100644 test/integration/resetAuthor/test.json delete mode 100644 test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/searching/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/searching/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/searching/expected/repo/.git_keep/config delete mode 100644 test/integration/searching/expected/repo/.git_keep/description delete mode 100644 test/integration/searching/expected/repo/.git_keep/index delete mode 100644 test/integration/searching/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/searching/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 delete mode 100644 test/integration/searching/expected/repo/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 delete mode 100644 test/integration/searching/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/searching/expected/repo/myfile1 delete mode 100644 test/integration/searching/expected/repo/myfile3 delete mode 100644 test/integration/searching/expected/repo/myfile4 delete mode 100644 test/integration/searching/expected/repo/myfile5 delete mode 100644 test/integration/searching/recording.json delete mode 100644 test/integration/searching/setup.sh delete mode 100644 test/integration/searching/test.json delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/config delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/description delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/index delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/searchingInStagingPanel/expected/repo/myfile1 delete mode 100644 test/integration/searchingInStagingPanel/recording.json delete mode 100644 test/integration/searchingInStagingPanel/setup.sh delete mode 100644 test/integration/searchingInStagingPanel/test.json delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/config delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/description delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/index delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/20/75aeb39a2a66a9607860a65b2a71c517760254 delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/87/10ece70b7db9638b9645e93abdbcf210fa4595 delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/ba/f3189129ba8878ba9b4107eaaaf3389287259b delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/d0/1c8bb001458d0a7c01193813685c658e0355ac delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/setAuthor/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/setAuthor/expected/repo/myfile1 delete mode 100644 test/integration/setAuthor/expected/repo/myfile2 delete mode 100644 test/integration/setAuthor/expected/repo/myfile3 delete mode 100644 test/integration/setAuthor/recording.json delete mode 100644 test/integration/setAuthor/setup.sh delete mode 100644 test/integration/setAuthor/test.json delete mode 100644 test/integration/setUpstream/expected/origin/HEAD delete mode 100644 test/integration/setUpstream/expected/origin/config delete mode 100644 test/integration/setUpstream/expected/origin/description delete mode 100644 test/integration/setUpstream/expected/origin/info/exclude delete mode 100644 test/integration/setUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/setUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/setUpstream/expected/origin/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf delete mode 100644 test/integration/setUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/setUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/setUpstream/expected/origin/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 delete mode 100644 test/integration/setUpstream/expected/origin/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 delete mode 100644 test/integration/setUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/setUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/setUpstream/expected/origin/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 delete mode 100644 test/integration/setUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/setUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/setUpstream/expected/origin/packed-refs delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/config delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/description delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/index delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/setUpstream/expected/repo/myfile1 delete mode 100644 test/integration/setUpstream/expected/repo/myfile2 delete mode 100644 test/integration/setUpstream/recording.json delete mode 100644 test/integration/setUpstream/setup.sh delete mode 100644 test/integration/setUpstream/test.json delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/HEAD delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/config delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/description delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/info/exclude delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/setUpstreamThroughPush/expected/origin/packed-refs delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/config delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/description delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/index delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/myfile1 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/myfile2 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/myfile3 delete mode 100644 test/integration/setUpstreamThroughPush/expected/repo/myfile4 delete mode 100644 test/integration/setUpstreamThroughPush/recording.json delete mode 100644 test/integration/setUpstreamThroughPush/setup.sh delete mode 100644 test/integration/setUpstreamThroughPush/test.json delete mode 100644 test/integration/unsetUpstream/expected/origin/HEAD delete mode 100644 test/integration/unsetUpstream/expected/origin/config delete mode 100644 test/integration/unsetUpstream/expected/origin/description delete mode 100644 test/integration/unsetUpstream/expected/origin/info/exclude delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/24/351b001b63ca15b6b83542ffb765567e17df23 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/70/10e33e20178a1a179853948691a9036d48e562 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/99/4a4733eacc0000721e01a177704e2f26216510 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/unsetUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/unsetUpstream/expected/origin/packed-refs delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/config delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/description delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/index delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/24/351b001b63ca15b6b83542ffb765567e17df23 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/70/10e33e20178a1a179853948691a9036d48e562 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/99/4a4733eacc0000721e01a177704e2f26216510 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/unsetUpstream/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/unsetUpstream/expected/repo/myfile1 delete mode 100644 test/integration/unsetUpstream/expected/repo/myfile2 delete mode 100644 test/integration/unsetUpstream/recording.json delete mode 100644 test/integration/unsetUpstream/setup.sh delete mode 100644 test/integration/unsetUpstream/test.json diff --git a/pkg/integration/components/prompt_driver.go b/pkg/integration/components/prompt_driver.go index 45a6db513..59e3587ef 100644 --- a/pkg/integration/components/prompt_driver.go +++ b/pkg/integration/components/prompt_driver.go @@ -32,8 +32,7 @@ func (self *PromptDriver) Type(value string) *PromptDriver { } func (self *PromptDriver) Clear() *PromptDriver { - // TODO: soft-code this - self.t.press("") + self.t.press(ClearKey) return self } diff --git a/pkg/integration/components/search_driver.go b/pkg/integration/components/search_driver.go new file mode 100644 index 000000000..4ab4a4103 --- /dev/null +++ b/pkg/integration/components/search_driver.go @@ -0,0 +1,39 @@ +package components + +// TODO: soft-code this +const ClearKey = "" + +type SearchDriver struct { + t *TestDriver +} + +func (self *SearchDriver) getViewDriver() *ViewDriver { + return self.t.Views().Search() +} + +// asserts on the text initially present in the prompt +func (self *SearchDriver) InitialText(expected *matcher) *SearchDriver { + self.getViewDriver().Content(expected) + + return self +} + +func (self *SearchDriver) Type(value string) *SearchDriver { + self.t.typeContent(value) + + return self +} + +func (self *SearchDriver) Clear() *SearchDriver { + self.t.press(ClearKey) + + return self +} + +func (self *SearchDriver) Confirm() { + self.getViewDriver().PressEnter() +} + +func (self *SearchDriver) Cancel() { + self.getViewDriver().PressEscape() +} diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 2087cd389..8d47083ad 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -179,7 +179,7 @@ func (self *Shell) StashWithMessage(message string) *Shell { } func (self *Shell) SetConfig(key string, value string) *Shell { - self.RunCommand(fmt.Sprintf(`git config --local "%s" %s`, key, value)) + self.RunCommand(fmt.Sprintf(`git config --local "%s" "%s"`, key, value)) return self } diff --git a/pkg/integration/components/test_driver.go b/pkg/integration/components/test_driver.go index 1128de3f5..e52cc8915 100644 --- a/pkg/integration/components/test_driver.go +++ b/pkg/integration/components/test_driver.go @@ -159,6 +159,19 @@ func (self *TestDriver) ExpectClipboard(matcher *matcher) { }) } +func (self *TestDriver) ExpectSearch() *SearchDriver { + self.inSearch() + + return &SearchDriver{t: self} +} + +func (self *TestDriver) inSearch() { + self.assertWithRetries(func() (bool, string) { + currentView := self.gui.CurrentContext().GetView() + return currentView.Name() == "search", "Expected search prompt to be focused" + }) +} + // for making assertions through git itself func (self *TestDriver) Git() *Git { return &Git{assertionHelper: self.assertionHelper, shell: self.shell} diff --git a/pkg/integration/components/views.go b/pkg/integration/components/views.go index 4c8002469..ea5257602 100644 --- a/pkg/integration/components/views.go +++ b/pkg/integration/components/views.go @@ -127,3 +127,7 @@ func (self *Views) Suggestions() *ViewDriver { func (self *Views) MergeConflicts() *ViewDriver { return self.byName("mergeConflicts") } + +func (self *Views) Search() *ViewDriver { + return self.byName("search") +} diff --git a/pkg/integration/tests/branch/reset_upstream.go b/pkg/integration/tests/branch/reset_upstream.go new file mode 100644 index 000000000..126d2abf9 --- /dev/null +++ b/pkg/integration/tests/branch/reset_upstream.go @@ -0,0 +1,36 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reset the upstream of a branch", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.CloneIntoRemote("origin") + shell.SetBranchUpstream("master", "origin/master") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream + Lines( + Contains("master").Contains("origin master").IsSelected(), + ). + Press(keys.Branches.SetUpstream). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Set/unset upstream")). + Select(Contains("unset upstream of selected branch")). + Confirm() + }). + Lines( + Contains("master").DoesNotContain("origin master").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/branch/set_upstream.go b/pkg/integration/tests/branch/set_upstream.go new file mode 100644 index 000000000..3388a6086 --- /dev/null +++ b/pkg/integration/tests/branch/set_upstream.go @@ -0,0 +1,40 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Set the upstream of a branch", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.CloneIntoRemote("origin") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream + Lines( + Contains("master").DoesNotContain("origin master").IsSelected(), + ). + Press(keys.Branches.SetUpstream). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Set/unset upstream")). + Select(Contains(" set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Enter upstream as ' '")). + SuggestionLines(Equals("origin master")). + ConfirmFirstSuggestion() + }). + Lines( + Contains("master").Contains("origin master").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/commit/reset_author.go b/pkg/integration/tests/commit/reset_author.go new file mode 100644 index 000000000..f54b5b5aa --- /dev/null +++ b/pkg/integration/tests/commit/reset_author.go @@ -0,0 +1,39 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ResetAuthor = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reset author on a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.SetConfig("user.email", "Bill@example.com") + shell.SetConfig("user.name", "Bill Smith") + + shell.EmptyCommit("one") + + shell.SetConfig("user.email", "John@example.com") + shell.SetConfig("user.name", "John Smith") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("BS").Contains("one").IsSelected(), + ). + Press(keys.Commits.ResetCommitAuthor). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Amend commit attribute")). + Select(Contains("reset author")). + Confirm() + }). + Lines( + Contains("JS").Contains("one").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/commit/search.go b/pkg/integration/tests/commit/search.go new file mode 100644 index 000000000..7159b11d1 --- /dev/null +++ b/pkg/integration/tests/commit/search.go @@ -0,0 +1,107 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Search = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Search for a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.EmptyCommit("four") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("two"). + Confirm() + + t.Views().Search().Content(Contains("matches for 'two' (1 of 1)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two").IsSelected(), + Contains("one"), + ). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("o"). + Confirm() + + t.Views().Search().Content(Contains("matches for 'o' (2 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two").IsSelected(), + Contains("one"), + ). + Press("n"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (3 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one").IsSelected(), + ). + Press("n"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (1 of 3)")) + }). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press("n"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (2 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two").IsSelected(), + Contains("one"), + ). + Press("N"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (1 of 3)")) + }). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press("N"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (3 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/commit/set_author.go b/pkg/integration/tests/commit/set_author.go new file mode 100644 index 000000000..047ac167c --- /dev/null +++ b/pkg/integration/tests/commit/set_author.go @@ -0,0 +1,51 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SetAuthor = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Set author on a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.SetConfig("user.email", "Bill@example.com") + shell.SetConfig("user.name", "Bill Smith") + + shell.EmptyCommit("one") + + shell.SetConfig("user.email", "John@example.com") + shell.SetConfig("user.name", "John Smith") + + shell.EmptyCommit("two") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("JS").Contains("two").IsSelected(), + Contains("BS").Contains("one"), + ). + Press(keys.Commits.ResetCommitAuthor). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Amend commit attribute")). + Select(Contains(" set author")). // adding space at start to distinguish from 'reset author' + Confirm() + + t.ExpectPopup().Prompt(). + Title(Contains("Set author")). + SuggestionLines( + Contains("John Smith"), + Contains("Bill Smith"), + ). + ConfirmSuggestion(Contains("John Smith")) + }). + Lines( + Contains("JS").Contains("two").IsSelected(), + Contains("BS").Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/staging/search.go b/pkg/integration/tests/staging/search.go new file mode 100644 index 000000000..b7a42a276 --- /dev/null +++ b/pkg/integration/tests/staging/search.go @@ -0,0 +1,42 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Search = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Use the search feature in the staging panel", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFile("file1", "one\ntwo\nthree\nfour\nfive") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("four"). + Confirm() + + t.Views().Search().Content(Contains("matches for 'four' (1 of 1)")) + }). + SelectedLine(Contains("+four")). // stage the line + PressPrimaryAction(). + Content(DoesNotContain("+four")). + Tap(func() { + t.Views().StagingSecondary(). + Content(Contains("+four")) + }) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index a7cade4d4..635451b54 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -18,6 +18,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/misc" "github.com/jesseduffield/lazygit/pkg/integration/tests/patch_building" "github.com/jesseduffield/lazygit/pkg/integration/tests/reflog" + "github.com/jesseduffield/lazygit/pkg/integration/tests/staging" "github.com/jesseduffield/lazygit/pkg/integration/tests/stash" "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule" "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" @@ -38,6 +39,8 @@ var tests = []*components.IntegrationTest{ branch.RebaseAndDrop, branch.RebaseDoesNotAutosquash, branch.Reset, + branch.ResetUpstream, + branch.SetUpstream, branch.Suggestions, cherry_pick.CherryPick, cherry_pick.CherryPickConflicts, @@ -46,8 +49,11 @@ var tests = []*components.IntegrationTest{ commit.CreateTag, commit.DiscardOldFileChange, commit.NewBranch, + commit.ResetAuthor, commit.Revert, commit.RevertMerge, + commit.Search, + commit.SetAuthor, commit.StageRangeOfLines, commit.Staged, commit.StagedWithoutHooks, @@ -92,6 +98,7 @@ var tests = []*components.IntegrationTest{ reflog.CherryPick, reflog.Patch, reflog.Reset, + staging.Search, stash.Apply, stash.ApplyPatch, stash.CreateBranch, diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/resetAuthor/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index f4b7a0e26..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/FETCH_HEAD b/test/integration/resetAuthor/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/HEAD b/test/integration/resetAuthor/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/config b/test/integration/resetAuthor/expected/repo/.git_keep/config deleted file mode 100644 index 85e571409..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = Author2@example.com - name = Author2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/description b/test/integration/resetAuthor/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/resetAuthor/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/resetAuthor/expected/repo/.git_keep/index b/test/integration/resetAuthor/expected/repo/.git_keep/index deleted file mode 100644 index d28ffa71e66a8b0666bb358641ac392e5bcf88af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_q_VoHN>-+GVKgHH1202S%W4LO#w834j9-CjM1YuW>7K`bRa0+# zi3pA2$#=RC;MLN7m4Q9CGA%PF)exuvq+glk?ok*GHRmw8ITAcSj2e{ooqM@zQFv8< z%PZ~q7V0o_jDY5Z1i88bDM 1651932821 +0200 commit (initial): myfile1 -291bcc7e708303b395f52245ec988ddbc985bae3 63aff3f0f54955ea149f9c2f3c07697b8864940d Author1 1651932821 +0200 commit: myfile2 -63aff3f0f54955ea149f9c2f3c07697b8864940d 0714eb875f11c56a2dc8c53c148889fe43602349 Author2 1651932824 +0200 commit (amend): myfile2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/resetAuthor/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 882fa7c0e..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 291bcc7e708303b395f52245ec988ddbc985bae3 Author1 1651932821 +0200 commit (initial): myfile1 -291bcc7e708303b395f52245ec988ddbc985bae3 63aff3f0f54955ea149f9c2f3c07697b8864940d Author1 1651932821 +0200 commit: myfile2 -63aff3f0f54955ea149f9c2f3c07697b8864940d 0714eb875f11c56a2dc8c53c148889fe43602349 Author2 1651932824 +0200 commit (amend): myfile2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/07/14eb875f11c56a2dc8c53c148889fe43602349 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/07/14eb875f11c56a2dc8c53c148889fe43602349 deleted file mode 100644 index c355bd74a03328e92b2aad87deaec8811b9a3883..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0hNwR3IZ_@1zqP9*$a|%Cp~Ep(WB(k!GVc03=#D92Jr%}s(4WF^4i+m zHCT7(yNHexIvYJ#Q;JAsVj-@HkOB}DfMhB-OKOX|JVwYi~ZE#08nZNMgRZ+ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3 deleted file mode 100644 index a351f8296..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3 +++ /dev/null @@ -1,2 +0,0 @@ -xQ -0D)_lݦ G&,tz{xfx0oR5[ S4kDs X&ZhLE<۽pW{lzJ.];<>x:wM:{uSt5' \ No newline at end of file diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d b/test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d deleted file mode 100644 index 3d713469f..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d +++ /dev/null @@ -1,2 +0,0 @@ -xK -1] $=iѣ3 xP5;]D:)E2Dd*: ]#dH9O2`M}KJI>E*>} \۶)<ŀQc">dB \ No newline at end of file diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/resetAuthor/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/resetAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/resetAuthor/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/resetAuthor/expected/repo/.git_keep/refs/heads/master b/test/integration/resetAuthor/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 73d857f01..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0714eb875f11c56a2dc8c53c148889fe43602349 diff --git a/test/integration/resetAuthor/expected/repo/myfile1 b/test/integration/resetAuthor/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/resetAuthor/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/resetAuthor/expected/repo/myfile2 b/test/integration/resetAuthor/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/resetAuthor/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/resetAuthor/recording.json b/test/integration/resetAuthor/recording.json deleted file mode 100644 index 40a1552ac..000000000 --- a/test/integration/resetAuthor/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":638,"Mod":0,"Key":256,"Ch":52},{"Timestamp":1406,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2584,"Mod":0,"Key":256,"Ch":121},{"Timestamp":5654,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":117,"Height":83}]} \ No newline at end of file diff --git a/test/integration/resetAuthor/setup.sh b/test/integration/resetAuthor/setup.sh deleted file mode 100644 index a521883c1..000000000 --- a/test/integration/resetAuthor/setup.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "Author1@example.com" -git config user.name "Author1" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -git config user.email "Author2@example.com" -git config user.name "Author2" diff --git a/test/integration/resetAuthor/test.json b/test/integration/resetAuthor/test.json deleted file mode 100644 index 8e14c4d8e..000000000 --- a/test/integration/resetAuthor/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test the author of a commit is reset to a different name/email.", "speed": 5 } diff --git a/test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/searching/expected/repo/.git_keep/FETCH_HEAD b/test/integration/searching/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/searching/expected/repo/.git_keep/HEAD b/test/integration/searching/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/searching/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/searching/expected/repo/.git_keep/config b/test/integration/searching/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/searching/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/searching/expected/repo/.git_keep/description b/test/integration/searching/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/searching/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/searching/expected/repo/.git_keep/index b/test/integration/searching/expected/repo/.git_keep/index deleted file mode 100644 index 8c9f1df2bb5b06c01e938610e3fdf265fea02436..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmW1rBfkst-&%kI#pctF3m 1617671505 +1000 commit (initial): myfile1 -f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 -6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 -5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 -fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 84a0ee396..000000000 --- a/test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI 1617671505 +1000 commit (initial): myfile1 -f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 -6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 -5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 -fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/searching/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/searching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/searching/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/searching/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/searching/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/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c b/test/integration/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c deleted file mode 100644 index 36207db40cb9576db8ecb4f26752b64a0c221317..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$5(qn^*fx*|RtNrxXsU3wZf!>^dTiqQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ jAt*{r8T?K1rLOMM6u+g&`RLW6Pxp7XedGrKso*^4-=aZU diff --git a/test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 b/test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 deleted file mode 100644 index c20549cea3674120d012a7f189ddd4c4167cc4e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gcW<3c@fDKvCB@MfQTsWHLz#B7&pPi5&BiveSZ$QbPr0l@6KPYwMuH}bCL2hp}Tv1!Fb AlK=n! diff --git a/test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815cfa19b4d357807bedcbb2277b2e3ba8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb{;fo08o?%QUCw| diff --git a/test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d b/test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d deleted file mode 100644 index 925e7d7e9..000000000 --- a/test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] oDzdcK7GpxkmП!mxPwwRW'Sv`9 yu3 TFe@<[bc;Cmʅv!űa>1F ;Nu3W[ק8o: \ No newline at end of file diff --git a/test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 b/test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 deleted file mode 100644 index b83e266ba..000000000 --- a/test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9L#?3Xhl)n╵wHap6XFQ3|%JQY6[Aѫj)gR+])RD0s%I\w'C>m\`֣EDsc˟ܴ΋d=;g \ No newline at end of file diff --git a/test/integration/searching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/searching/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/searching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/searching/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/searching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/searching/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/searching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/searching/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/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 b/test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 deleted file mode 100644 index 4d1e18b15..000000000 --- a/test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9I#M&XR"~̖r*Jd7Y)J4$gᚲ\zWa>NO$Vf ~0be5qjz~l5~RwV@rvkzqe2DIt^$c2iOQG`QsEb3(-$0cz@v!z{M-Ez&bF!3NhLP8u!vUkogQ zDb!jZ&L+M4W8LjI+3Psn^^@B6)Js|0&Ek<1j|^ 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" -echo test5 > myfile5 diff --git a/test/integration/searching/test.json b/test/integration/searching/test.json deleted file mode 100644 index 41e095612..000000000 --- a/test/integration/searching/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "" } diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/FETCH_HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/config b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/description b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/searchingInStagingPanel/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/searchingInStagingPanel/expected/repo/.git_keep/index b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/index deleted file mode 100644 index 9f0c187e4b5d99f142a8e18e3d122897873c4e8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmZ?q402{*U|<4bMj*xk8kZnTtkg~OKE%bcF-cnf#N>;T*^UzW_Zir8E7LM_QVoF$ zLxNmgfs`bJp@IRIm~Y>@)w{g~n*RPyH{Hi*5*+NXNiT282f^#Q@+< GZ5{y4v?28X diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/info/exclude b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/searchingInStagingPanel/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/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 307e32726..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 -70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 307e32726..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 -70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 deleted file mode 100644 index c64d709a0d497cda6a9792d9c414fd6b2cb332c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmV-40L%Y)0V^p=O;s>9WiT`_Ff%bx$gNDv%tR@PQdSlbCkSaMxk!lQMFGiq^5j4Uv-6>^W+UXa02Ss)jtdMig%K15O41mj zM53G$8~(KWcG!8b)4bgD%XNS1W!>tvH?f=O3G5jGz;xQDn*OO9erNLo3vf8ltx!j> diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 deleted file mode 100644 index 6fb186172936dc1c4e8da9cb802e2b3ad6d8124d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmV-40L%Y)0V^p=O;s>9WiT`_Ff%bx$gNDv%t|5Z)B z@g*WOiYMRcLV#CG_f-b=+{(1foK!=g0+4>CyuL3m8fuO?x;YX&Ka3ib_MLmVYEgJq zf6FWF`4;LhbBv(os2GLIgUkWZP;I*&F^-3WwAMy! 1652008089 +1000 commit (initial): myfile1 -2075aeb39a2a66a9607860a65b2a71c517760254 d01c8bb001458d0a7c01193813685c658e0355ac Author1 1652008089 +1000 commit: myfile2 -d01c8bb001458d0a7c01193813685c658e0355ac 8710ece70b7db9638b9645e93abdbcf210fa4595 Author2 1652008089 +1000 commit: myfile3 -8710ece70b7db9638b9645e93abdbcf210fa4595 baf3189129ba8878ba9b4107eaaaf3389287259b Author2 1652008097 +1000 commit (amend): myfile3 diff --git a/test/integration/setAuthor/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/setAuthor/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 38d45fb5d..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 2075aeb39a2a66a9607860a65b2a71c517760254 Author1 1652008089 +1000 commit (initial): myfile1 -2075aeb39a2a66a9607860a65b2a71c517760254 d01c8bb001458d0a7c01193813685c658e0355ac Author1 1652008089 +1000 commit: myfile2 -d01c8bb001458d0a7c01193813685c658e0355ac 8710ece70b7db9638b9645e93abdbcf210fa4595 Author2 1652008089 +1000 commit: myfile3 -8710ece70b7db9638b9645e93abdbcf210fa4595 baf3189129ba8878ba9b4107eaaaf3389287259b Author2 1652008097 +1000 commit (amend): myfile3 diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setAuthor/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/setAuthor/expected/repo/.git_keep/objects/20/75aeb39a2a66a9607860a65b2a71c517760254 b/test/integration/setAuthor/expected/repo/.git_keep/objects/20/75aeb39a2a66a9607860a65b2a71c517760254 deleted file mode 100644 index ce4b3233f..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/objects/20/75aeb39a2a66a9607860a65b2a71c517760254 +++ /dev/null @@ -1,2 +0,0 @@ -xQ -0D)_ݸn%M6Xhz{xfx0ob-em@"ČAq2MF*I#/|N9l\cSҵGT ~+nFȋ5' \ No newline at end of file diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setAuthor/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/setAuthor/expected/repo/.git_keep/objects/87/10ece70b7db9638b9645e93abdbcf210fa4595 b/test/integration/setAuthor/expected/repo/.git_keep/objects/87/10ece70b7db9638b9645e93abdbcf210fa4595 deleted file mode 100644 index 573b0d49cd8d0f4b70fdb25ae5624514250f6685..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0hNwX3c@fDME%Yw@-N74Hc7W2qDM(L8!R-oln8ozgLnbI-pqr6k+s&j zS%?16c2(;p97s4~E}p0)Po<=cR2YOOLMNe9)NE`~^A08nuUMF0Q* diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setAuthor/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/setAuthor/expected/repo/.git_keep/objects/ba/f3189129ba8878ba9b4107eaaaf3389287259b b/test/integration/setAuthor/expected/repo/.git_keep/objects/ba/f3189129ba8878ba9b4107eaaaf3389287259b deleted file mode 100644 index 18a5ff1cd8f2626258d86128a8130da7d84cfdfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0d0=K3c@fDL_Oy#au;Mbo3vXH(N9S?8!Q-GN(B9TgS0nKZ)V`Z$Xv=) ztwVpPtEzP)_9Wb4%AP1kPdUeglo^CaLMNe7)GTq;XSE5i^$`Gl-~_Q3KpcpXIu6nW zR-h1~nE0yqd9}A6(4Mz&)psn*Lr*f7i^VQD00tiH5dpxowcV?_i*6U)e{twH(Ueb~ L9!lm5T1G-h2^2;m diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/d0/1c8bb001458d0a7c01193813685c658e0355ac b/test/integration/setAuthor/expected/repo/.git_keep/objects/d0/1c8bb001458d0a7c01193813685c658e0355ac deleted file mode 100644 index e9d69bf0f4b5a5683960c3cf75fcf12c31964290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0hNwH3c@fDMP26<*$Xl=O(qG5=usx^1PhHVC4%1GAYQ=Le>`~b$FOp|I!oRm|^Ja8oDi6}!Mhio?4_0dBJUNjF$NSGxtgvcQ5GfBYF zV+ai7osnm|ue-f{2krR>SA9v{7Cnt?y;x*V01;xcM+5-VZNJy_@6gnDnHMGV0pct{ EedY5)kN^Mx diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setAuthor/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/setAuthor/expected/repo/.git_keep/refs/heads/master b/test/integration/setAuthor/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 2499d7343..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -baf3189129ba8878ba9b4107eaaaf3389287259b diff --git a/test/integration/setAuthor/expected/repo/myfile1 b/test/integration/setAuthor/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/setAuthor/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/setAuthor/expected/repo/myfile2 b/test/integration/setAuthor/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/setAuthor/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/setAuthor/expected/repo/myfile3 b/test/integration/setAuthor/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/setAuthor/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/setAuthor/recording.json b/test/integration/setAuthor/recording.json deleted file mode 100644 index 9084af754..000000000 --- a/test/integration/setAuthor/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1118,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1382,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2654,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3632,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4070,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6702,"Mod":0,"Key":9,"Ch":9},{"Timestamp":7486,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7899,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9141,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/setAuthor/setup.sh b/test/integration/setAuthor/setup.sh deleted file mode 100644 index 2eeb4d549..000000000 --- a/test/integration/setAuthor/setup.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "Author1@example.com" -git config user.name "Author1" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -git config user.email "Author2@example.com" -git config user.name "Author2" - -echo test3 > myfile3 -git add . -git commit -am "myfile3" diff --git a/test/integration/setAuthor/test.json b/test/integration/setAuthor/test.json deleted file mode 100644 index c8426b12c..000000000 --- a/test/integration/setAuthor/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "In this test the author of a commit is set to a different name/email.", - "speed": 5 -} diff --git a/test/integration/setUpstream/expected/origin/HEAD b/test/integration/setUpstream/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstream/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstream/expected/origin/config b/test/integration/setUpstream/expected/origin/config deleted file mode 100644 index f97482c61..000000000 --- a/test/integration/setUpstream/expected/origin/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true -[remote "origin"] - url = /home/mark/Downloads/gits/lazygit/test/integration/setUpstream/actual/./repo diff --git a/test/integration/setUpstream/expected/origin/description b/test/integration/setUpstream/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstream/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/setUpstream/expected/origin/info/exclude b/test/integration/setUpstream/expected/origin/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/setUpstream/expected/origin/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/setUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/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/setUpstream/expected/origin/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf b/test/integration/setUpstream/expected/origin/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf deleted file mode 100644 index 099d02445fdf141c28061a77c4b09ac4677e8b68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJor&88`c2tD-~NxF*#V@rvkzc)|tG%(Cz%2w;z zER6ot4iSqP1}ZVYqMk^TC)Kn7X>=uK0xaBF#O&#iSF>SZfXEC!W#6OhQDJaEIC8-N zI${bzok{QZ*bY0*_BzdX`J}o(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/setUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/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/setUpstream/expected/origin/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 b/test/integration/setUpstream/expected/origin/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 deleted file mode 100644 index d9b4d87b953dd9bf41d06854fab7bf2ccaebecfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeJnPl8p-@LQj20(%r>EV@rvkzqe2DIt;^1Yio12 zp5m$RBDUlZeMzK_Swsm*khEgJDeLb6z$o8bLODORF^+>)4n<{0_F$l$U1Gs CxJZ8h diff --git a/test/integration/setUpstream/expected/origin/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 b/test/integration/setUpstream/expected/origin/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 deleted file mode 100644 index 7965d6afb..000000000 --- a/test/integration/setUpstream/expected/origin/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9i -"BW=FL!R"~r*JdFY)JՁr.0p~6fw e t;uSr?2X, \ No newline at end of file diff --git a/test/integration/setUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/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/setUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/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/setUpstream/expected/origin/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 b/test/integration/setUpstream/expected/origin/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 deleted file mode 100644 index 19012a4aa22d268a396f8294b3ad8c7d7a718e78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmV;I0BHYs0gcW<3c@fDKvCB@MfQTsB$;UfB0^U^Mw-lE!PrtF=GUPpeB#1KKsgr;yjQh zloDKuSc{tc?vHi1<7BVnbeB(V+fy!OZ8wWd;5ZQldjz diff --git a/test/integration/setUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/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/setUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/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/setUpstream/expected/origin/packed-refs b/test/integration/setUpstream/expected/origin/packed-refs deleted file mode 100644 index f854ff120..000000000 --- a/test/integration/setUpstream/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -ce3220d7b3cbc57811e3e6169349c611f62a7c42 refs/heads/master diff --git a/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index b60b7b2a0..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -ce3220d7b3cbc57811e3e6169349c611f62a7c42 not-for-merge branch 'master' of ../origin diff --git a/test/integration/setUpstream/expected/repo/.git_keep/HEAD b/test/integration/setUpstream/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD b/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 6e2a4de9b..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ce3220d7b3cbc57811e3e6169349c611f62a7c42 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/config b/test/integration/setUpstream/expected/repo/.git_keep/config deleted file mode 100644 index 64b94ff0f..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/config +++ /dev/null @@ -1,14 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = 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 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/description b/test/integration/setUpstream/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/index b/test/integration/setUpstream/expected/repo/.git_keep/index deleted file mode 100644 index 25d84640330ed656da0cbc4f9d33c92ee8dc0aa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_q*&P^ 1650269554 +0200 commit (initial): myfile1 -9c663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 commit: myfile2 -6d51185514ab4f80b42f17013295c261f92a66f0 2758cffdc0d931ff3a3d6c58b75f91ec42981dcf CI 1650269554 +0200 commit: myfile3 -2758cffdc0d931ff3a3d6c58b75f91ec42981dcf ce3220d7b3cbc57811e3e6169349c611f62a7c42 CI 1650269554 +0200 commit: myfile4 -ce3220d7b3cbc57811e3e6169349c611f62a7c42 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 reset: moving to HEAD~2 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 300481fb2..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 9c663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 CI 1650269554 +0200 commit (initial): myfile1 -9c663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 commit: myfile2 -6d51185514ab4f80b42f17013295c261f92a66f0 2758cffdc0d931ff3a3d6c58b75f91ec42981dcf CI 1650269554 +0200 commit: myfile3 -2758cffdc0d931ff3a3d6c58b75f91ec42981dcf ce3220d7b3cbc57811e3e6169349c611f62a7c42 CI 1650269554 +0200 commit: myfile4 -ce3220d7b3cbc57811e3e6169349c611f62a7c42 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 reset: moving to HEAD~2 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index ade370956..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ce3220d7b3cbc57811e3e6169349c611f62a7c42 CI 1650269559 +0200 fetch origin: storing head diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf b/test/integration/setUpstream/expected/repo/.git_keep/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf deleted file mode 100644 index 099d02445fdf141c28061a77c4b09ac4677e8b68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJor&88`c2tD-~NxF*#V@rvkzc)|tG%(Cz%2w;z zER6ot4iSqP1}ZVYqMk^TC)Kn7X>=uK0xaBF#O&#iSF>SZfXEC!W#6OhQDJaEIC8-N zI${bzok{QZ*bY0*_BzdX`J}o(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/setUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 b/test/integration/setUpstream/expected/repo/.git_keep/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 deleted file mode 100644 index d9b4d87b953dd9bf41d06854fab7bf2ccaebecfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeJnPl8p-@LQj20(%r>EV@rvkzqe2DIt;^1Yio12 zp5m$RBDUlZeMzK_Swsm*khEgJDeLb6z$o8bLODORF^+>)4n<{0_F$l$U1Gs CxJZ8h diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 b/test/integration/setUpstream/expected/repo/.git_keep/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 deleted file mode 100644 index 7965d6afb..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9i -"BW=FL!R"~r*JdFY)JՁr.0p~6fw e t;uSr?2X, \ No newline at end of file diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 b/test/integration/setUpstream/expected/repo/.git_keep/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 deleted file mode 100644 index 19012a4aa22d268a396f8294b3ad8c7d7a718e78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmV;I0BHYs0gcW<3c@fDKvCB@MfQTsB$;UfB0^U^Mw-lE!PrtF=GUPpeB#1KKsgr;yjQh zloDKuSc{tc?vHi1<7BVnbeB(V+fy!OZ8wWd;5ZQldjz diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 0147cfa3f..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -6d51185514ab4f80b42f17013295c261f92a66f0 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 6e2a4de9b..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -ce3220d7b3cbc57811e3e6169349c611f62a7c42 diff --git a/test/integration/setUpstream/expected/repo/myfile1 b/test/integration/setUpstream/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/setUpstream/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/setUpstream/expected/repo/myfile2 b/test/integration/setUpstream/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/setUpstream/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/setUpstream/recording.json b/test/integration/setUpstream/recording.json deleted file mode 100644 index a84937cc7..000000000 --- a/test/integration/setUpstream/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":558,"Mod":0,"Key":256,"Ch":108},{"Timestamp":992,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1583,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2109,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2232,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2278,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2413,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2478,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2538,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2831,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3060,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3234,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3293,"Mod":0,"Key":256,"Ch":47},{"Timestamp":3454,"Mod":0,"Key":256,"Ch":111},{"Timestamp":3594,"Mod":0,"Key":256,"Ch":114},{"Timestamp":3632,"Mod":0,"Key":256,"Ch":105},{"Timestamp":3780,"Mod":0,"Key":256,"Ch":103},{"Timestamp":3831,"Mod":0,"Key":256,"Ch":105},{"Timestamp":3890,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4150,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4695,"Mod":0,"Key":256,"Ch":102},{"Timestamp":5433,"Mod":0,"Key":256,"Ch":91},{"Timestamp":6106,"Mod":0,"Key":256,"Ch":117},{"Timestamp":6884,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7833,"Mod":0,"Key":9,"Ch":9},{"Timestamp":8301,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9114,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":55}]} \ No newline at end of file diff --git a/test/integration/setUpstream/setup.sh b/test/integration/setUpstream/setup.sh deleted file mode 100644 index d0bc91327..000000000 --- a/test/integration/setUpstream/setup.sh +++ /dev/null @@ -1,32 +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 diff --git a/test/integration/setUpstream/test.json b/test/integration/setUpstream/test.json deleted file mode 100644 index 32b4b9d64..000000000 --- a/test/integration/setUpstream/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "allow setting the upstream of the current branch", "speed": 10 } diff --git a/test/integration/setUpstreamThroughPush/expected/origin/HEAD b/test/integration/setUpstreamThroughPush/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/origin/config b/test/integration/setUpstreamThroughPush/expected/origin/config deleted file mode 100644 index 63958f045..000000000 --- a/test/integration/setUpstreamThroughPush/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/setUpstream/actual/./repo diff --git a/test/integration/setUpstreamThroughPush/expected/origin/description b/test/integration/setUpstreamThroughPush/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/setUpstreamThroughPush/expected/origin/info/exclude b/test/integration/setUpstreamThroughPush/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 b/test/integration/setUpstreamThroughPush/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 deleted file mode 100644 index a6fdc2a4bff0fbb7f08397a61c7674b4a950b865..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJobZZ-*s2tD-~X}XIAV@rvkzqe2DI?TY-wY8;N z$aLzvi1o@4$pweW5hewifH|asfhDph47G#|W-GhAx~;5QCz(@rJ|oS:5G=Md~9 \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 b/test/integration/setUpstreamThroughPush/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 deleted file mode 100644 index 714f1dd9de6fbc76d18247c02b51e8cecedcaee7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}H$*&+Hbk$=_rV}g}TS^4Iy*+}f2amUSvbMH# z3xhxPUDaZNM3N)S)e}|rR4dOwH9N_L03{q0H5>2x>XtF`FeADlX-SE*RIH^y4uH(w zi<3Z+(eS%J*4>Viy^hmeKisybUSw@I3(;rt5d+yXfOF=s$5hupbJM}lpN08nuUO8@`> diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/packed-refs b/test/integration/setUpstreamThroughPush/expected/origin/packed-refs deleted file mode 100644 index 300d293d2..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -30ef3df33d31f0b98298881be4dbe69c54758ba2 refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/FETCH_HEAD b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 125d82b6f..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -30ef3df33d31f0b98298881be4dbe69c54758ba2 branch 'master' of ../origin diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/HEAD b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/ORIG_HEAD b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 0b53f05ce..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/config b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/config deleted file mode 100644 index 7721ae814..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/config +++ /dev/null @@ -1,16 +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 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/description b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/index b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/index deleted file mode 100644 index 99e8224ebe3991142152701cbb94c302261866b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmL&Tly;^6YSHfsU1_oB9x!1ZG7#f!_Ffe`vsu2NVwxxR>|5Z)B z@g*WOiYMRcLV#CG_f-b=+{(1foK!=g0+4>~2iLB`Xs9`h(9MzH`C-(cwC~)@Rg1!_ z`deOU&$m#AnPUVoXPS65$2*`oU>ai1bz5|E?q~CApDBCxhX0hpA$0*Se~n#7q+#Y5 z!_27*S_U=;NJGuBLpSG=$fx&kRl1``DX vF8#z3R^|rhevyr75sSl~CppI~ohWgYRf*}#6w}}zvyYr 1648346253 +1100 commit (initial): myfile1 -6305259d1908bee46b3b686702ed55b6f12e9ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 commit: myfile2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 c6ffcbed8902934d462722ff6ef471813b9a4df5 CI 1648346253 +1100 commit: myfile3 -c6ffcbed8902934d462722ff6ef471813b9a4df5 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346253 +1100 commit: myfile4 -30ef3df33d31f0b98298881be4dbe69c54758ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 reset: moving to HEAD~2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (start): checkout 30ef3df33d31f0b98298881be4dbe69c54758ba2 -30ef3df33d31f0b98298881be4dbe69c54758ba2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e0e98143e..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 6305259d1908bee46b3b686702ed55b6f12e9ba2 CI 1648346253 +1100 commit (initial): myfile1 -6305259d1908bee46b3b686702ed55b6f12e9ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 commit: myfile2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 c6ffcbed8902934d462722ff6ef471813b9a4df5 CI 1648346253 +1100 commit: myfile3 -c6ffcbed8902934d462722ff6ef471813b9a4df5 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346253 +1100 commit: myfile4 -30ef3df33d31f0b98298881be4dbe69c54758ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 reset: moving to HEAD~2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (finish): refs/heads/master onto 30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 774c65ed0..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346260 +1100 fetch origin: storing head diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 deleted file mode 100644 index a6fdc2a4bff0fbb7f08397a61c7674b4a950b865..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJobZZ-*s2tD-~X}XIAV@rvkzqe2DI?TY-wY8;N z$aLzvi1o@4$pweW5hewifH|asfhDph47G#|W-GhAx~;5QCz(@rJ|oS:5G=Md~9 \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 deleted file mode 100644 index 714f1dd9de6fbc76d18247c02b51e8cecedcaee7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}H$*&+Hbk$=_rV}g}TS^4Iy*+}f2amUSvbMH# z3xhxPUDaZNM3N)S)e}|rR4dOwH9N_L03{q0H5>2x>XtF`FeADlX-SE*RIH^y4uH(w zi<3Z+(eS%J*4>Viy^hmeKisybUSw@I3(;rt5d+yXfOF=s$5hupbJM}lpN08nuUO8@`> diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/refs/heads/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index af1728373..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index af1728373..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile1 b/test/integration/setUpstreamThroughPush/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile2 b/test/integration/setUpstreamThroughPush/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile3 b/test/integration/setUpstreamThroughPush/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile4 b/test/integration/setUpstreamThroughPush/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/setUpstreamThroughPush/recording.json b/test/integration/setUpstreamThroughPush/recording.json deleted file mode 100644 index 8776559d9..000000000 --- a/test/integration/setUpstreamThroughPush/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":808,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1221,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1598,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2267,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2399,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2500,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2573,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2634,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2710,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3042,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3671,"Mod":0,"Key":256,"Ch":46},{"Timestamp":4001,"Mod":0,"Key":256,"Ch":46},{"Timestamp":4215,"Mod":0,"Key":256,"Ch":47},{"Timestamp":4511,"Mod":0,"Key":256,"Ch":111},{"Timestamp":4896,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5008,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5133,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5202,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5255,"Mod":0,"Key":256,"Ch":110},{"Timestamp":5558,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6247,"Mod":0,"Key":256,"Ch":102},{"Timestamp":7072,"Mod":0,"Key":256,"Ch":91},{"Timestamp":7716,"Mod":0,"Key":256,"Ch":112},{"Timestamp":8319,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9159,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":254,"Height":74}]} \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/setup.sh b/test/integration/setUpstreamThroughPush/setup.sh deleted file mode 100644 index d0bc91327..000000000 --- a/test/integration/setUpstreamThroughPush/setup.sh +++ /dev/null @@ -1,32 +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 diff --git a/test/integration/setUpstreamThroughPush/test.json b/test/integration/setUpstreamThroughPush/test.json deleted file mode 100644 index 11fdee3ab..000000000 --- a/test/integration/setUpstreamThroughPush/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "allow setting the upstream of the current branch when pushing", "speed": 10 } diff --git a/test/integration/unsetUpstream/expected/origin/HEAD b/test/integration/unsetUpstream/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/unsetUpstream/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/unsetUpstream/expected/origin/config b/test/integration/unsetUpstream/expected/origin/config deleted file mode 100644 index 56c5e2484..000000000 --- a/test/integration/unsetUpstream/expected/origin/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true -[remote "origin"] - url = /home/mark/Downloads/gits/lazygit/test/integration/unsetUpstream/actual/./repo diff --git a/test/integration/unsetUpstream/expected/origin/description b/test/integration/unsetUpstream/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/unsetUpstream/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/unsetUpstream/expected/origin/info/exclude b/test/integration/unsetUpstream/expected/origin/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/unsetUpstream/expected/origin/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/unsetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/unsetUpstream/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/unsetUpstream/expected/origin/objects/24/351b001b63ca15b6b83542ffb765567e17df23 b/test/integration/unsetUpstream/expected/origin/objects/24/351b001b63ca15b6b83542ffb765567e17df23 deleted file mode 100644 index 5167b74e45597d6563be14ade4ece72fa09c2b49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeKzp*<>3K5qjz~*09AwV@rvkzc){Cj>87Fl8__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/unsetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/unsetUpstream/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/unsetUpstream/expected/origin/objects/70/10e33e20178a1a179853948691a9036d48e562 b/test/integration/unsetUpstream/expected/origin/objects/70/10e33e20178a1a179853948691a9036d48e562 deleted file mode 100644 index 33c505be28a045db5c244dba95e61a1b8b0cfc0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93d0}}0DJZo-U~%nU0o=pkW-#vbe9Hd6M}{I_w@-q&M=25TWf3A zmi(z7%sNNsZ4M-+R%Rh2Mv?^`CP1tJixKb^)t(Q2bq$FYaKY!|Vl`~^A08nuUMF0Q* diff --git a/test/integration/unsetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/unsetUpstream/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/unsetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/unsetUpstream/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/unsetUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/unsetUpstream/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/unsetUpstream/expected/origin/packed-refs b/test/integration/unsetUpstream/expected/origin/packed-refs deleted file mode 100644 index e06647f53..000000000 --- a/test/integration/unsetUpstream/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -24351b001b63ca15b6b83542ffb765567e17df23 refs/heads/master diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/unsetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/unsetUpstream/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e19f7f35c..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -24351b001b63ca15b6b83542ffb765567e17df23 branch 'master' of ../origin diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/HEAD b/test/integration/unsetUpstream/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/ORIG_HEAD b/test/integration/unsetUpstream/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 6f628d611..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -24351b001b63ca15b6b83542ffb765567e17df23 diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/config b/test/integration/unsetUpstream/expected/repo/.git_keep/config deleted file mode 100644 index 6ee7a0eac..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/config +++ /dev/null @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/description b/test/integration/unsetUpstream/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/unsetUpstream/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/unsetUpstream/expected/repo/.git_keep/index b/test/integration/unsetUpstream/expected/repo/.git_keep/index deleted file mode 100644 index 44c532da33ec09a2a3006010b770202174fa0a50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_q*ysWhI@CoU^Gxnis7^JHwK2rB@7JAFCdtKZRwuJe^pa&e2EB+ z;>mZq5a89)eU*Vdw=yj=C)E(B38bIVWoieEhM1$mfo_fj&kv&prG4jKu38jc)!*_; zd%lG_%p4=2rjQ_4S0E+HV5DHcwcJE1^26PCKQo`r-)7d7c1fFGMQr8Qr|kB3mdHOb PJiMkg?vU0kuaG1F$8bf$ diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/info/exclude b/test/integration/unsetUpstream/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/unsetUpstream/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 1bc609ea6..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 289b2354ac3770d96fc3fcfd2a8026fc78a32cc5 CI 1650269774 +0200 commit (initial): myfile1 -289b2354ac3770d96fc3fcfd2a8026fc78a32cc5 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 commit: myfile2 -7010e33e20178a1a179853948691a9036d48e562 994a4733eacc0000721e01a177704e2f26216510 CI 1650269774 +0200 commit: myfile3 -994a4733eacc0000721e01a177704e2f26216510 24351b001b63ca15b6b83542ffb765567e17df23 CI 1650269774 +0200 commit: myfile4 -24351b001b63ca15b6b83542ffb765567e17df23 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 reset: moving to HEAD~2 diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 1bc609ea6..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 289b2354ac3770d96fc3fcfd2a8026fc78a32cc5 CI 1650269774 +0200 commit (initial): myfile1 -289b2354ac3770d96fc3fcfd2a8026fc78a32cc5 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 commit: myfile2 -7010e33e20178a1a179853948691a9036d48e562 994a4733eacc0000721e01a177704e2f26216510 CI 1650269774 +0200 commit: myfile3 -994a4733eacc0000721e01a177704e2f26216510 24351b001b63ca15b6b83542ffb765567e17df23 CI 1650269774 +0200 commit: myfile4 -24351b001b63ca15b6b83542ffb765567e17df23 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 reset: moving to HEAD~2 diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index cbf8607af..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 24351b001b63ca15b6b83542ffb765567e17df23 CI 1650269774 +0200 fetch origin: storing head diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/unsetUpstream/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/unsetUpstream/expected/repo/.git_keep/objects/24/351b001b63ca15b6b83542ffb765567e17df23 b/test/integration/unsetUpstream/expected/repo/.git_keep/objects/24/351b001b63ca15b6b83542ffb765567e17df23 deleted file mode 100644 index 5167b74e45597d6563be14ade4ece72fa09c2b49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeKzp*<>3K5qjz~*09AwV@rvkzc){Cj>87Fl8__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/unsetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/unsetUpstream/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/unsetUpstream/expected/repo/.git_keep/objects/70/10e33e20178a1a179853948691a9036d48e562 b/test/integration/unsetUpstream/expected/repo/.git_keep/objects/70/10e33e20178a1a179853948691a9036d48e562 deleted file mode 100644 index 33c505be28a045db5c244dba95e61a1b8b0cfc0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93d0}}0DJZo-U~%nU0o=pkW-#vbe9Hd6M}{I_w@-q&M=25TWf3A zmi(z7%sNNsZ4M-+R%Rh2Mv?^`CP1tJixKb^)t(Q2bq$FYaKY!|Vl`~^A08nuUMF0Q* diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/unsetUpstream/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/unsetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/unsetUpstream/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/unsetUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/unsetUpstream/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/unsetUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/unsetUpstream/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 3bfa11663..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -7010e33e20178a1a179853948691a9036d48e562 diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/unsetUpstream/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 6f628d611..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -24351b001b63ca15b6b83542ffb765567e17df23 diff --git a/test/integration/unsetUpstream/expected/repo/myfile1 b/test/integration/unsetUpstream/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/unsetUpstream/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/unsetUpstream/expected/repo/myfile2 b/test/integration/unsetUpstream/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/unsetUpstream/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/unsetUpstream/recording.json b/test/integration/unsetUpstream/recording.json deleted file mode 100644 index 55de5696a..000000000 --- a/test/integration/unsetUpstream/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1106,"Mod":0,"Key":256,"Ch":108},{"Timestamp":1714,"Mod":0,"Key":256,"Ch":117},{"Timestamp":2494,"Mod":0,"Key":256,"Ch":117},{"Timestamp":3449,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":55}]} \ No newline at end of file diff --git a/test/integration/unsetUpstream/setup.sh b/test/integration/unsetUpstream/setup.sh deleted file mode 100644 index bd33f9f6d..000000000 --- a/test/integration/unsetUpstream/setup.sh +++ /dev/null @@ -1,36 +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 -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master - diff --git a/test/integration/unsetUpstream/test.json b/test/integration/unsetUpstream/test.json deleted file mode 100644 index dffe129cd..000000000 --- a/test/integration/unsetUpstream/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "allow unsetting the upstream of the current branch", "speed": 10 } From 1034962c7edad578427d056b7421c9195c29a457 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Feb 2023 22:25:18 +1100 Subject: [PATCH 3/3] 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 }