From 22c10479d528d3d9982f142139f82a8c764a550d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Feb 2023 21:15:03 +1100 Subject: [PATCH] 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 }