From bbdbbd0b1b88f0c008d982cf69c8f330b072fc45 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Apr 2021 14:39:25 +1000 Subject: [PATCH] more tests --- test/integration/diffing3/test.json | 2 +- .../expected/.git_keep/COMMIT_EDITMSG | 2 +- .../rebaseReword/expected/.git_keep/index | Bin 281 -> 281 bytes .../rebaseReword/expected/.git_keep/logs/HEAD | 8 ++-- .../expected/.git_keep/logs/refs/heads/master | 8 ++-- .../13/82f9e49487698170ca3356542ed94aff522d18 | Bin 148 -> 0 bytes .../17/19c3b9865f00407fbee59ee004104edc8bb62e | 2 - .../32/6168774f6c6d9b88ec70f0abe5625f07d3b353 | 4 ++ .../4a/225f57a7e50ba304defb8db41d9736dd85613d | 3 -- .../5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 | Bin 0 -> 147 bytes .../77/a46efac3df6a531125dd83031978f4207fb0bf | 3 -- .../b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 | Bin 0 -> 148 bytes .../be/0070df1dcd3839a2d908622817fee59d918d4d | Bin 0 -> 150 bytes .../expected/.git_keep/refs/heads/master | 2 +- test/integration/rebaseReword/recording.json | 2 +- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../reflogCheckout/expected/.git_keep/HEAD | 1 + .../reflogCheckout/expected/.git_keep/config | 10 +++++ .../expected/.git_keep/description | 1 + .../reflogCheckout/expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 ++++ .../expected/.git_keep/logs/HEAD | 10 +++++ .../.git_keep/logs/refs/heads/branch2 | 4 ++ .../expected/.git_keep/logs/refs/heads/ma | 1 + .../expected/.git_keep/logs/refs/heads/master | 4 ++ .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../10/e005e1fa2db07721aa63cb048b87b7a2830b64 | Bin 0 -> 148 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 | Bin 0 -> 119 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../37/661793a793e075730b85b9c3b300195738fc63 | Bin 0 -> 147 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 | Bin 0 -> 147 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../9a/cb41da3b683497b3966135ccd64411b8ef698f | Bin 0 -> 147 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 | 2 + .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 | 2 + .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/ma | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../integration/reflogCheckout/expected/file0 | 1 + .../integration/reflogCheckout/expected/file1 | 1 + .../integration/reflogCheckout/expected/file2 | 1 + .../integration/reflogCheckout/expected/file4 | 2 + .../integration/reflogCheckout/recording.json | 1 + test/integration/reflogCheckout/setup.sh | 38 ++++++++++++++++++ test/integration/reflogCheckout/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../reflogCherryPick/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 10 +++++ .../expected/.git_keep/description | 1 + .../reflogCherryPick/expected/.git_keep/index | Bin 0 -> 334 bytes .../expected/.git_keep/info/exclude | 7 ++++ .../expected/.git_keep/logs/HEAD | 12 ++++++ .../.git_keep/logs/refs/heads/branch2 | 4 ++ .../expected/.git_keep/logs/refs/heads/master | 5 +++ .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../35/bedc872b1ca9e026e51c4017416acba4b3d64b | 2 + .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../43/12f3a59c644c52ad89254be43d7a7987e56bed | Bin 0 -> 126 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 | 2 + .../71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 | 2 + .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a9/55e641b00e7e896842122a3537c70476d7b4e0 | Bin 0 -> 148 bytes .../ac/7b38400c8aed050f379f9643b953b9d428fda1 | 2 + .../af/eb127e4579981e4b852e8aabb44b07f2ea4e09 | Bin 0 -> 148 bytes .../bc/8891320172f4cfa3efd7bb8767a46daa200d79 | Bin 0 -> 147 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd | Bin 0 -> 147 bytes .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../reflogCherryPick/expected/file0 | 1 + .../reflogCherryPick/expected/file1 | 1 + .../reflogCherryPick/expected/file2 | 2 + .../reflogCherryPick/expected/file4 | 1 + .../reflogCherryPick/recording.json | 1 + test/integration/reflogCherryPick/setup.sh | 38 ++++++++++++++++++ test/integration/reflogCherryPick/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../reflogCommitFiles/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/config | 10 +++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 ++++ .../expected/.git_keep/logs/HEAD | 9 +++++ .../.git_keep/logs/refs/heads/branch2 | 5 +++ .../expected/.git_keep/logs/refs/heads/master | 4 ++ .../07/e795700fa240713f5577867a45eb6f2071d856 | Bin 0 -> 148 bytes .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../44/5557afd2775df735bc53b891678e6bd9072638 | Bin 0 -> 146 bytes .../53/26459d9a0c196b18cc31dc95f05c9a4e4462de | Bin 0 -> 146 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../75/6e436bdd05b965c967edc1929432917e3864cd | 3 ++ .../7d/61d1707885895d92f021111196df4466347327 | Bin 0 -> 147 bytes .../86/3cae3fe21db864bc92b74ae4820e628e5eaf8b | Bin 0 -> 127 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b | Bin 0 -> 119 bytes .../b0/bf1c26d59a724c767948a6de15664bfc0c292f | 2 + .../c5/4d82926c7b673499d675aec8732cfe08aed761 | 3 ++ .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../reflogCommitFiles/expected/file0 | 1 + .../reflogCommitFiles/expected/file1 | 1 + .../reflogCommitFiles/expected/file2 | 2 + .../reflogCommitFiles/expected/file4 | 2 + .../reflogCommitFiles/recording.json | 1 + test/integration/reflogCommitFiles/setup.sh | 38 ++++++++++++++++++ test/integration/reflogCommitFiles/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../reflogHardReset/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../reflogHardReset/expected/.git_keep/config | 10 +++++ .../expected/.git_keep/description | 1 + .../reflogHardReset/expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 ++++ .../expected/.git_keep/logs/HEAD | 9 +++++ .../.git_keep/logs/refs/heads/branch2 | 5 +++ .../expected/.git_keep/logs/refs/heads/master | 4 ++ .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 | 2 + .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../1f/d818af9eb65653e98def81168002cabc353b6a | Bin 0 -> 147 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 | Bin 0 -> 148 bytes .../49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 | Bin 0 -> 119 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../7c/03a659737f2cc728a2a572cedee98019bbd04b | Bin 0 -> 147 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../94/0576e482f2193afad72ea2205c05fd01507e1a | 4 ++ .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../reflogHardReset/expected/file0 | 1 + .../reflogHardReset/expected/file1 | 1 + .../reflogHardReset/expected/file2 | 1 + .../reflogHardReset/expected/file4 | 2 + .../reflogHardReset/recording.json | 1 + test/integration/reflogHardReset/setup.sh | 38 ++++++++++++++++++ test/integration/reflogHardReset/test.json | 1 + .../undo/expected/.git_keep/COMMIT_EDITMSG | 24 +++++++++++ .../undo/expected/.git_keep/FETCH_HEAD | 0 test/integration/undo/expected/.git_keep/HEAD | 1 + .../undo/expected/.git_keep/ORIG_HEAD | 1 + .../undo/expected/.git_keep/config | 10 +++++ .../undo/expected/.git_keep/description | 1 + .../integration/undo/expected/.git_keep/index | Bin 0 -> 353 bytes .../undo/expected/.git_keep/info/exclude | 7 ++++ .../undo/expected/.git_keep/logs/HEAD | 20 +++++++++ .../.git_keep/logs/refs/heads/branch2 | 11 +++++ .../expected/.git_keep/logs/refs/heads/master | 4 ++ .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../3e/4f2b1aeb076cff592279f94b1f495442690521 | Bin 0 -> 147 bytes .../4f/77a25a15ccca0273baa522f7281727f31ceeb8 | 2 + .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../5d/2b236ff0e8342ef1e531506f6f99070d53cf25 | Bin 0 -> 147 bytes .../68/ac4e416c01408d37c59465852aa1856a4abdb1 | Bin 0 -> 146 bytes .../6d/95d7a7842625152ba887482879dfdaf247f591 | Bin 0 -> 119 bytes .../7c/e8eac65e3ae50cb50a570dc775b745464f3a3e | Bin 0 -> 148 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../99/36b8f380c2937bb457ade468bfc7dc850293f9 | Bin 0 -> 153 bytes .../9d/187b7f4819a69996dd27e3d66a5224e05d9f41 | Bin 0 -> 150 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../fc/f46511d7819220e0cc310ae6d891fadfdb79aa | 3 ++ .../expected/.git_keep/refs/heads/branch2 | 1 + .../undo/expected/.git_keep/refs/heads/master | 1 + test/integration/undo/expected/file0 | 1 + test/integration/undo/expected/file1 | 1 + test/integration/undo/expected/file2 | 1 + test/integration/undo/expected/file4 | 3 ++ test/integration/undo/recording.json | 1 + test/integration/undo/setup.sh | 38 ++++++++++++++++++ test/integration/undo/test.json | 1 + .../undo2/expected/.git_keep/COMMIT_EDITMSG | 1 + .../undo2/expected/.git_keep/FETCH_HEAD | 0 .../integration/undo2/expected/.git_keep/HEAD | 1 + .../undo2/expected/.git_keep/ORIG_HEAD | 1 + .../undo2/expected/.git_keep/config | 10 +++++ .../undo2/expected/.git_keep/description | 1 + .../undo2/expected/.git_keep/index | Bin 0 -> 353 bytes .../undo2/expected/.git_keep/info/exclude | 7 ++++ .../undo2/expected/.git_keep/logs/HEAD | 28 +++++++++++++ .../.git_keep/logs/refs/heads/branch2 | 11 +++++ .../expected/.git_keep/logs/refs/heads/master | 8 ++++ .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../0e/2680a41392859e5159716b50525850017c6a59 | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../48/1ce2cf9d037b83acb1d452973695764bf7b95e | 2 + .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 | Bin 0 -> 118 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a3/bf51bf610771f997de1d3f313ab7c43e20bef5 | Bin 0 -> 148 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c | Bin 0 -> 147 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../df/1876c035ade1ba199afadd399a6d4273190cd8 | Bin 0 -> 146 bytes .../e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 | Bin 0 -> 148 bytes .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/master | 1 + test/integration/undo2/expected/file0 | 1 + test/integration/undo2/expected/file1 | 1 + test/integration/undo2/expected/file2 | 1 + test/integration/undo2/expected/file4 | 1 + test/integration/undo2/recording.json | 1 + test/integration/undo2/setup.sh | 38 ++++++++++++++++++ test/integration/undo2/test.json | 1 + 267 files changed, 654 insertions(+), 20 deletions(-) delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/17/19c3b9865f00407fbee59ee004104edc8bb62e create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353 delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d create mode 100644 test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/reflogCheckout/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/reflogCheckout/expected/.git_keep/HEAD create mode 100644 test/integration/reflogCheckout/expected/.git_keep/config create mode 100644 test/integration/reflogCheckout/expected/.git_keep/description create mode 100644 test/integration/reflogCheckout/expected/.git_keep/index create mode 100644 test/integration/reflogCheckout/expected/.git_keep/info/exclude create mode 100644 test/integration/reflogCheckout/expected/.git_keep/logs/HEAD create mode 100644 test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma create mode 100644 test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/reflogCheckout/expected/.git_keep/refs/heads/ma create mode 100644 test/integration/reflogCheckout/expected/.git_keep/refs/heads/master create mode 100644 test/integration/reflogCheckout/expected/file0 create mode 100644 test/integration/reflogCheckout/expected/file1 create mode 100644 test/integration/reflogCheckout/expected/file2 create mode 100644 test/integration/reflogCheckout/expected/file4 create mode 100644 test/integration/reflogCheckout/recording.json create mode 100644 test/integration/reflogCheckout/setup.sh create mode 100644 test/integration/reflogCheckout/test.json create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/HEAD create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/config create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/description create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/index create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/info/exclude create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master create mode 100644 test/integration/reflogCherryPick/expected/file0 create mode 100644 test/integration/reflogCherryPick/expected/file1 create mode 100644 test/integration/reflogCherryPick/expected/file2 create mode 100644 test/integration/reflogCherryPick/expected/file4 create mode 100644 test/integration/reflogCherryPick/recording.json create mode 100644 test/integration/reflogCherryPick/setup.sh create mode 100644 test/integration/reflogCherryPick/test.json create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/HEAD create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/config create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/description create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/index create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/info/exclude create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/logs/HEAD create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master create mode 100644 test/integration/reflogCommitFiles/expected/file0 create mode 100644 test/integration/reflogCommitFiles/expected/file1 create mode 100644 test/integration/reflogCommitFiles/expected/file2 create mode 100644 test/integration/reflogCommitFiles/expected/file4 create mode 100644 test/integration/reflogCommitFiles/recording.json create mode 100644 test/integration/reflogCommitFiles/setup.sh create mode 100644 test/integration/reflogCommitFiles/test.json create mode 100644 test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/reflogHardReset/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/reflogHardReset/expected/.git_keep/HEAD create mode 100644 test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/reflogHardReset/expected/.git_keep/config create mode 100644 test/integration/reflogHardReset/expected/.git_keep/description create mode 100644 test/integration/reflogHardReset/expected/.git_keep/index create mode 100644 test/integration/reflogHardReset/expected/.git_keep/info/exclude create mode 100644 test/integration/reflogHardReset/expected/.git_keep/logs/HEAD create mode 100644 test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/reflogHardReset/expected/.git_keep/refs/heads/master create mode 100644 test/integration/reflogHardReset/expected/file0 create mode 100644 test/integration/reflogHardReset/expected/file1 create mode 100644 test/integration/reflogHardReset/expected/file2 create mode 100644 test/integration/reflogHardReset/expected/file4 create mode 100644 test/integration/reflogHardReset/recording.json create mode 100644 test/integration/reflogHardReset/setup.sh create mode 100644 test/integration/reflogHardReset/test.json create mode 100644 test/integration/undo/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/undo/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/undo/expected/.git_keep/HEAD create mode 100644 test/integration/undo/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/undo/expected/.git_keep/config create mode 100644 test/integration/undo/expected/.git_keep/description create mode 100644 test/integration/undo/expected/.git_keep/index create mode 100644 test/integration/undo/expected/.git_keep/info/exclude create mode 100644 test/integration/undo/expected/.git_keep/logs/HEAD create mode 100644 test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/undo/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/undo/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/undo/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 create mode 100644 test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 create mode 100644 test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 create mode 100644 test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 create mode 100644 test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 create mode 100644 test/integration/undo/expected/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e create mode 100644 test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 create mode 100644 test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 create mode 100644 test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa create mode 100644 test/integration/undo/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/undo/expected/.git_keep/refs/heads/master create mode 100644 test/integration/undo/expected/file0 create mode 100644 test/integration/undo/expected/file1 create mode 100644 test/integration/undo/expected/file2 create mode 100644 test/integration/undo/expected/file4 create mode 100644 test/integration/undo/recording.json create mode 100644 test/integration/undo/setup.sh create mode 100644 test/integration/undo/test.json create mode 100644 test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/undo2/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/undo2/expected/.git_keep/HEAD create mode 100644 test/integration/undo2/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/undo2/expected/.git_keep/config create mode 100644 test/integration/undo2/expected/.git_keep/description create mode 100644 test/integration/undo2/expected/.git_keep/index create mode 100644 test/integration/undo2/expected/.git_keep/info/exclude create mode 100644 test/integration/undo2/expected/.git_keep/logs/HEAD create mode 100644 test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/undo2/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 create mode 100644 test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/undo2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/undo2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e create mode 100644 test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 create mode 100644 test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 create mode 100644 test/integration/undo2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c create mode 100644 test/integration/undo2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/undo2/expected/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 create mode 100644 test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 create mode 100644 test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/undo2/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/undo2/expected/.git_keep/refs/heads/master create mode 100644 test/integration/undo2/expected/file0 create mode 100644 test/integration/undo2/expected/file1 create mode 100644 test/integration/undo2/expected/file2 create mode 100644 test/integration/undo2/expected/file4 create mode 100644 test/integration/undo2/recording.json create mode 100644 test/integration/undo2/setup.sh create mode 100644 test/integration/undo2/test.json diff --git a/test/integration/diffing3/test.json b/test/integration/diffing3/test.json index e6156b2cf..8e427d1f4 100644 --- a/test/integration/diffing3/test.json +++ b/test/integration/diffing3/test.json @@ -1 +1 @@ -{ "description": "diffing two commits and making a patch from their diff files", "speed": 1 } +{ "description": "diffing two commits and making a patch from their diff files", "speed": 10 } diff --git a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG index 9daeafb98..c18cd76ce 100644 --- a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG @@ -1 +1 @@ -test +qas diff --git a/test/integration/rebaseReword/expected/.git_keep/index b/test/integration/rebaseReword/expected/.git_keep/index index a25ab61cc96986d31c5c1837ef7242f500f569c2..f86f898390a3ea83cb0bef351ef1bc13ab1687f0 100644 GIT binary patch delta 117 zcmbQqG?Pii#WTp6fq{Vuh?x_zpWf!-{rMe6Gcqu+u<0cqo~U9Z_VhMy_!?o542Xux u+?tpJlHsf0-3^if(NLM!6SoA41SXu@{C}#6xx^QZ{c);`F8?aHVh;dL#4QZ~ delta 117 zcmbQqG?Pii#WTp6fq{Vuh?x_z_iHdMTc8G`85tN@*mRfPn5beTwqJw!r29XR42Xux vyq}l@l3{sd+6s~Z(GZzs3=_8mis=7+x_RdII%h|T)|>Ck?SH@hIqMhzAP6cG diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD b/test/integration/rebaseReword/expected/.git_keep/logs/HEAD index fc84f04f9..d6b1c711e 100644 --- a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD +++ b/test/integration/rebaseReword/expected/.git_keep/logs/HEAD @@ -1,4 +1,4 @@ -0000000000000000000000000000000000000000 77a46efac3df6a531125dd83031978f4207fb0bf CI 1617674024 +1000 commit (initial): file0 -77a46efac3df6a531125dd83031978f4207fb0bf 1382f9e49487698170ca3356542ed94aff522d18 CI 1617674024 +1000 commit: file1 -1382f9e49487698170ca3356542ed94aff522d18 1719c3b9865f00407fbee59ee004104edc8bb62e CI 1617674024 +1000 commit: file2 -1719c3b9865f00407fbee59ee004104edc8bb62e 4a225f57a7e50ba304defb8db41d9736dd85613d CI 1617674028 +1000 commit (amend): test +0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI 1617683931 +1000 commit (initial): file0 +326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI 1617683931 +1000 commit: file1 +b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI 1617683931 +1000 commit: file2 +5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI 1617683936 +1000 commit (amend): qas diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master index fc84f04f9..d6b1c711e 100644 --- a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master @@ -1,4 +1,4 @@ -0000000000000000000000000000000000000000 77a46efac3df6a531125dd83031978f4207fb0bf CI 1617674024 +1000 commit (initial): file0 -77a46efac3df6a531125dd83031978f4207fb0bf 1382f9e49487698170ca3356542ed94aff522d18 CI 1617674024 +1000 commit: file1 -1382f9e49487698170ca3356542ed94aff522d18 1719c3b9865f00407fbee59ee004104edc8bb62e CI 1617674024 +1000 commit: file2 -1719c3b9865f00407fbee59ee004104edc8bb62e 4a225f57a7e50ba304defb8db41d9736dd85613d CI 1617674028 +1000 commit (amend): test +0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI 1617683931 +1000 commit (initial): file0 +326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI 1617683931 +1000 commit: file1 +b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI 1617683931 +1000 commit: file2 +5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI 1617683936 +1000 commit (amend): qas diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 b/test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 deleted file mode 100644 index 112af2af6f8cce3a35ce2f5c737e80325a826476..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcWv3d1lAK+(=Vh4(^{Y{!bBltQK)Ly;vKNSY8_=<%B)bp5>H%eJm_ z^H{>A9jd+pWsxERg@rlPm~9f`(pilfBIHz3PUv<%^xZrWr>w>jt7YyYV(4n^BSb9J zTM9rn!DNmU-Ty1`tX>MG9?JfUl9P@S}4DxIte00Qy2@{QY_V6i#HI1)QAFz)@8P=b~@xebT-0%N<0+^nJY^ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf b/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf deleted file mode 100644 index bfcd244a3..000000000 --- a/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf +++ /dev/null @@ -1,3 +0,0 @@ -xA -0Fa9cb@U4АR"x|{nպtK| -!$bharTi;i/mmnM;lǤ$7eYm+ \ No newline at end of file diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 b/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 new file mode 100644 index 0000000000000000000000000000000000000000..d1a2e4efe8f0618667292ae4b553c3f4ae08249d GIT binary patch literal 148 zcmV;F0Biqv0gcW<3d0}}K+&!}h5JGo9UT=)DP)yn=s40qY(lWm<2Og>_VX5>x89eb zO|qA9i0BG|m=iOk%sJbN)Cz~3e5)uHfn0LrjN0=d@1fC>p%{W|#8gv>Q8++@T*Q<0 z4MN3&9##H~*LLV>*7s?C$~X6Yl^bvUp$(Zp5fd7HH2|Q_dQJ`bldHC@V$=_RN~Y|LCqqOSotW+K9Y z#ibAnBvkb7*JabwtjB4-$cNf`mlH4TtZm%$;L%%sw8j{<(|xMTA3gqb^`w{j0=j5A EM6S|GTL1t6 literal 0 HcmV?d00001 diff --git a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master index d123c9d33..ec7aaf6be 100644 --- a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master +++ b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -4a225f57a7e50ba304defb8db41d9736dd85613d +be0070df1dcd3839a2d908622817fee59d918d4d diff --git a/test/integration/rebaseReword/recording.json b/test/integration/rebaseReword/recording.json index 54095b121..5f3537e08 100644 --- a/test/integration/rebaseReword/recording.json +++ b/test/integration/rebaseReword/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":943,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1079,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1471,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1975,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2048,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2231,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2279,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2911,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3087,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3264,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3440,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3615,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3888,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4735,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":715,"Mod":0,"Key":259,"Ch":0},{"Timestamp":978,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2098,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2730,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2930,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3154,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3410,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3682,"Mod":0,"Key":271,"Ch":0},{"Timestamp":4306,"Mod":0,"Key":256,"Ch":113},{"Timestamp":4658,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4922,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5322,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6066,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/reflogCheckout/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCheckout/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogCheckout/expected/.git_keep/HEAD b/test/integration/reflogCheckout/expected/.git_keep/HEAD new file mode 100644 index 000000000..63e0b0bf0 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/ma diff --git a/test/integration/reflogCheckout/expected/.git_keep/config b/test/integration/reflogCheckout/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogCheckout/expected/.git_keep/description b/test/integration/reflogCheckout/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogCheckout/expected/.git_keep/index b/test/integration/reflogCheckout/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..6f3c8c4714d1ec4a722867ac3050fa805d47ed03 GIT binary patch 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^ literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/info/exclude b/test/integration/reflogCheckout/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/HEAD b/test/integration/reflogCheckout/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..6fcc2f198 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +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/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..071cb8406 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,4 @@ +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/.git_keep/logs/refs/heads/ma b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma new file mode 100644 index 000000000..4d6ce4df1 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683567 +1000 branch: Created from fdc461c diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..331bd0c7a --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +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/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCheckout/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 b/test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 new file mode 100644 index 0000000000000000000000000000000000000000..1e1c0fb3909c296c4ec49e761a1996b2b4de1525 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 b/test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 new file mode 100644 index 0000000000000000000000000000000000000000..7dc2d466cea3d7df9b09b2bf12ef0c9358bb1ac0 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 0000000000000000000000000000000000000000..06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c GIT binary patch literal 21 ccmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 b/test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 new file mode 100644 index 0000000000000000000000000000000000000000..2f6201ab7d8799af803ce62b6ec5f40255c99bd3 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 0000000000000000000000000000000000000000..2920ab335181ed440a54f52297d3cb1ab3a70222 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f b/test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f new file mode 100644 index 0000000000000000000000000000000000000000..b310aa841ae01f8d9c6ad610445d9580fee628ae GIT binary patch literal 147 zcmV;E0Brww0gcX03c@fDKw;N8MfQTs=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 b/test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 new file mode 100644 index 000000000..b7e0a5cab --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 @@ -0,0 +1,2 @@ +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/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 0000000000000000000000000000000000000000..01ce23cee261a5c479d905ee8318e897bf4bca8f GIT binary patch literal 30 mcmb~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch 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^ literal 0 HcmV?d00001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 b/test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 new file mode 100644 index 000000000..72227f67d --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..40f23e49c --- /dev/null +++ b/test/integration/reflogCheckout/test.json @@ -0,0 +1 @@ +{ "description": "checking out a commit in the reflog context", "speed": 10 } diff --git a/test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCherryPick/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogCherryPick/expected/.git_keep/HEAD b/test/integration/reflogCherryPick/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD b/test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..9a97fa86f --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +afeb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/config b/test/integration/reflogCherryPick/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogCherryPick/expected/.git_keep/description b/test/integration/reflogCherryPick/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogCherryPick/expected/.git_keep/index b/test/integration/reflogCherryPick/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..913dfd5807f1d16cff8615c11888f76ff9fe067e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/info/exclude b/test/integration/reflogCherryPick/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD b/test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..a2378d782 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD @@ -0,0 +1,12 @@ +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/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..fc6af3173 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,4 @@ +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/.git_keep/logs/refs/heads/master b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..7d698f8ae --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +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/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCherryPick/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed b/test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed new file mode 100644 index 0000000000000000000000000000000000000000..a8e70c668ec079128c53032aaae858744b7befc4 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 b/test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 new file mode 100644 index 000000000..ed4c460f1 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 @@ -0,0 +1,2 @@ +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/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 b/test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 new file mode 100644 index 000000000..254d31eaa --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 @@ -0,0 +1,2 @@ +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/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCherryPick/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 0000000000000000000000000000000000000000..2920ab335181ed440a54f52297d3cb1ab3a70222 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 b/test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 new file mode 100644 index 0000000000000000000000000000000000000000..f1acbc48fa2034f2bd8ee00b9e1ce24a24d34ccb GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 b/test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 new file mode 100644 index 000000000..28711d3e7 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 @@ -0,0 +1,2 @@ +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/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 b/test/integration/reflogCherryPick/expected/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 new file mode 100644 index 0000000000000000000000000000000000000000..3861432eb475d4e062bc68b827c76d3da3f7675e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 b/test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 new file mode 100644 index 0000000000000000000000000000000000000000..97cea45095fd458d1d3f947581c9f36071a919a3 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd b/test/integration/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd new file mode 100644 index 0000000000000000000000000000000000000000..557ada37edeac16958d896533a3c776ae59bc3fe GIT binary patch literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)vlk@)Oh82Fs>euYCRk`pDG@xrJ%ZcE~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch 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^ literal 0 HcmV?d00001 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..bd45e4cdd --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +bc8891320172f4cfa3efd7bb8767a46daa200d79 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..255e95bd9 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +35bedc872b1ca9e026e51c4017416acba4b3d64b diff --git a/test/integration/reflogCherryPick/expected/file0 b/test/integration/reflogCherryPick/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/reflogCherryPick/expected/file1 b/test/integration/reflogCherryPick/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/reflogCherryPick/expected/file2 b/test/integration/reflogCherryPick/expected/file2 new file mode 100644 index 000000000..3baaa732b --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file2 @@ -0,0 +1,2 @@ +test2 +line two diff --git a/test/integration/reflogCherryPick/expected/file4 b/test/integration/reflogCherryPick/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/reflogCherryPick/recording.json b/test/integration/reflogCherryPick/recording.json new file mode 100644 index 000000000..aa6a25783 --- /dev/null +++ b/test/integration/reflogCherryPick/recording.json @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/reflogCherryPick/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +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 new file mode 100644 index 000000000..01c3dcbd4 --- /dev/null +++ b/test/integration/reflogCherryPick/test.json @@ -0,0 +1 @@ +{ "description": "cherry-picking a commit from the reflog context", "speed": 10 } diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..d72af3146 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +asd diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCommitFiles/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/HEAD b/test/integration/reflogCommitFiles/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/config b/test/integration/reflogCommitFiles/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/description b/test/integration/reflogCommitFiles/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/index b/test/integration/reflogCommitFiles/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..1f9535e1a633cd1094e85971cca1944f9e826845 GIT binary patch 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/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..222df85dc --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +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/.git_keep/logs/refs/heads/master b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..2d7aeb3dd --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +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/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 new file mode 100644 index 0000000000000000000000000000000000000000..d5890a18808d81cf7cb560ab233abe0bdb935110 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 new file mode 100644 index 0000000000000000000000000000000000000000..942c4cb98b714b533502785ddcc1ded38dbd557b GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd b/test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd new file mode 100644 index 000000000..11a1c2730 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd @@ -0,0 +1,3 @@ +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/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 new file mode 100644 index 0000000000000000000000000000000000000000..ce7286748dca7f7eede81b003b14c73e87532d08 GIT binary patch literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MfQTsB&goh>g#_X9}zI{=`y BM-%`6 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b b/test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b new file mode 100644 index 0000000000000000000000000000000000000000..61445855a46a03499ed9c9cf90d1b5cf871bc2cc GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 0000000000000000000000000000000000000000..2920ab335181ed440a54f52297d3cb1ab3a70222 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b b/test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b new file mode 100644 index 0000000000000000000000000000000000000000..d86c14ae8f3533497590af7edfa9d0b8d96446b7 GIT binary patch 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% literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch 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^ literal 0 HcmV?d00001 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..c47bc95c8 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +b0bf1c26d59a724c767948a6de15664bfc0c292f diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..7cfd9a220 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +445557afd2775df735bc53b891678e6bd9072638 diff --git a/test/integration/reflogCommitFiles/expected/file0 b/test/integration/reflogCommitFiles/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/reflogCommitFiles/expected/file1 b/test/integration/reflogCommitFiles/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/reflogCommitFiles/expected/file2 b/test/integration/reflogCommitFiles/expected/file2 new file mode 100644 index 000000000..3baaa732b --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file2 @@ -0,0 +1,2 @@ +test2 +line two diff --git a/test/integration/reflogCommitFiles/expected/file4 b/test/integration/reflogCommitFiles/expected/file4 new file mode 100644 index 000000000..e5c5c5583 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file4 @@ -0,0 +1,2 @@ +line one +line two diff --git a/test/integration/reflogCommitFiles/recording.json b/test/integration/reflogCommitFiles/recording.json new file mode 100644 index 000000000..bf91fbcf3 --- /dev/null +++ b/test/integration/reflogCommitFiles/recording.json @@ -0,0 +1 @@ +{"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":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}]} \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/setup.sh b/test/integration/reflogCommitFiles/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/reflogCommitFiles/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +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 new file mode 100644 index 000000000..df7ad6e19 --- /dev/null +++ b/test/integration/reflogCommitFiles/test.json @@ -0,0 +1 @@ +{ "description": "Accessing commit files of a reflog entry", "speed": 10 } diff --git a/test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/FETCH_HEAD b/test/integration/reflogHardReset/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogHardReset/expected/.git_keep/HEAD b/test/integration/reflogHardReset/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD b/test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..000eb0200 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +1fd818af9eb65653e98def81168002cabc353b6a diff --git a/test/integration/reflogHardReset/expected/.git_keep/config b/test/integration/reflogHardReset/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogHardReset/expected/.git_keep/description b/test/integration/reflogHardReset/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogHardReset/expected/.git_keep/index b/test/integration/reflogHardReset/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..fcbfa4ccfb13130e9b4f303f669a98d41ff489f9 GIT binary patch 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+ literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/info/exclude b/test/integration/reflogHardReset/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/reflogHardReset/expected/.git_keep/logs/HEAD b/test/integration/reflogHardReset/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..4b553fd32 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +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/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..558ce9a6b --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +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/.git_keep/logs/refs/heads/master b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..11f14b24e --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +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/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogHardReset/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 b/test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 new file mode 100644 index 000000000..a6ae1480f --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 @@ -0,0 +1,2 @@ +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/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogHardReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 b/test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 new file mode 100644 index 000000000..471870fd2 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 @@ -0,0 +1,2 @@ +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/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogHardReset/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a b/test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a new file mode 100644 index 0000000000000000000000000000000000000000..c4caad22e66ccc75891acae3891ffc6ccda770f4 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 b/test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 new file mode 100644 index 0000000000000000000000000000000000000000..a98e469b92ad57632c6f4993758ac24ac038d5ac GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 b/test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 new file mode 100644 index 0000000000000000000000000000000000000000..7d29a095932f81310bc8ab5c71ce232f0f7d8cc4 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b b/test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b new file mode 100644 index 0000000000000000000000000000000000000000..75304b52b9b786f665436c5e1d825ca00da4c4d8 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a b/test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a new file mode 100644 index 000000000..65f78d291 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a @@ -0,0 +1,4 @@ +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/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogHardReset/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 0000000000000000000000000000000000000000..01ce23cee261a5c479d905ee8318e897bf4bca8f GIT binary patch literal 30 mcmb~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch 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^ literal 0 HcmV?d00001 diff --git a/test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..9a9e37446 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/refs/heads/master b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..ebc65e0dd --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 diff --git a/test/integration/reflogHardReset/expected/file0 b/test/integration/reflogHardReset/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/reflogHardReset/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/reflogHardReset/expected/file1 b/test/integration/reflogHardReset/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/reflogHardReset/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/reflogHardReset/expected/file2 b/test/integration/reflogHardReset/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/reflogHardReset/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/reflogHardReset/expected/file4 b/test/integration/reflogHardReset/expected/file4 new file mode 100644 index 000000000..e5c5c5583 --- /dev/null +++ b/test/integration/reflogHardReset/expected/file4 @@ -0,0 +1,2 @@ +line one +line two diff --git a/test/integration/reflogHardReset/recording.json b/test/integration/reflogHardReset/recording.json new file mode 100644 index 000000000..d0ea679cd --- /dev/null +++ b/test/integration/reflogHardReset/recording.json @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/reflogHardReset/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +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 new file mode 100644 index 000000000..84304a953 --- /dev/null +++ b/test/integration/reflogHardReset/test.json @@ -0,0 +1 @@ +{ "description": "Hard resetting to commit in the reflog", "speed": 10 } diff --git a/test/integration/undo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/undo/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..2e97e3406 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,24 @@ +# This is a combination of 2 commits. +# This is the 1st commit message: + +file4 + +# This is the commit message #2: + +file4 + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Date: Tue Apr 6 14:29:30 2021 +1000 +# +# interactive rebase in progress; onto 68ac4e4 +# Last commands done (2 commands done): +# pick fcf4651 file4 +# squash 9d187b7 file4 +# No commands remaining. +# You are currently rebasing branch 'branch2' on '68ac4e4'. +# +# Changes to be committed: +# new file: file4 +# diff --git a/test/integration/undo/expected/.git_keep/FETCH_HEAD b/test/integration/undo/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/undo/expected/.git_keep/HEAD b/test/integration/undo/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/undo/expected/.git_keep/ORIG_HEAD b/test/integration/undo/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..ed9815e19 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +7ce8eac65e3ae50cb50a570dc775b745464f3a3e diff --git a/test/integration/undo/expected/.git_keep/config b/test/integration/undo/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/undo/expected/.git_keep/description b/test/integration/undo/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/undo/expected/.git_keep/index b/test/integration/undo/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..f347af7db01f63346167dfb9d2798fb41d70c25d GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1rbtHf8m(}U5BKruEw=M@YLjY}997{3D5hyXF0g^1Oa1^=|R zy$e3{zH{l#M|-E5-eO=)%gjkN07^43fb>i3W!(>>q2}yIH)rXd$A48*Z+wXejpE67 zx)9*i(tQsP%?xXG&H&8;(-3o9=AfG+!SlnYL22K)m#Y?qSM|5N(w=Xj4l&0F zX3jd55)DqEIba%UPBWT0vOHRg``8#BT)NMB=!aX%jfMW5Gb$nGn1Ia*337D>G9(#H x6b!g*H*w@waLar%dUt4|;CstR;T5a3T@{|K*d?VhPh+BAUu{RKLAut&g#ar>ah?DG literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/info/exclude b/test/integration/undo/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/undo/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/undo/expected/.git_keep/logs/HEAD b/test/integration/undo/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..faf40ba78 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/logs/HEAD @@ -0,0 +1,20 @@ +0000000000000000000000000000000000000000 6d95d7a7842625152ba887482879dfdaf247f591 CI 1617683370 +1000 commit (initial): file0 +6d95d7a7842625152ba887482879dfdaf247f591 4f77a25a15ccca0273baa522f7281727f31ceeb8 CI 1617683370 +1000 commit: file1 +4f77a25a15ccca0273baa522f7281727f31ceeb8 68ac4e416c01408d37c59465852aa1856a4abdb1 CI 1617683370 +1000 commit: file2 +68ac4e416c01408d37c59465852aa1856a4abdb1 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 commit: file4 +fcf46511d7819220e0cc310ae6d891fadfdb79aa fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 checkout: moving from master to branch2 +fcf46511d7819220e0cc310ae6d891fadfdb79aa 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683370 +1000 commit: file4 +5d2b236ff0e8342ef1e531506f6f99070d53cf25 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683370 +1000 commit: file4 +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683370 +1000 commit: file2 +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (start): checkout 3e4f2b1aeb076cff592279f94b1f495442690521 +3e4f2b1aeb076cff592279f94b1f495442690521 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (finish): returning to refs/heads/branch2 +3e4f2b1aeb076cff592279f94b1f495442690521 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683373 +1000 rebase -i (start): checkout fcf46511d7819220e0cc310ae6d891fadfdb79aa +5d2b236ff0e8342ef1e531506f6f99070d53cf25 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (fixup): file4 +9d187b7f4819a69996dd27e3d66a5224e05d9f41 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (finish): returning to refs/heads/branch2 +9d187b7f4819a69996dd27e3d66a5224e05d9f41 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683374 +1000 rebase -i (start): checkout 68ac4e416c01408d37c59465852aa1856a4abdb1 +fcf46511d7819220e0cc310ae6d891fadfdb79aa 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (squash): file4 +9936b8f380c2937bb457ade468bfc7dc850293f9 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (finish): returning to refs/heads/branch2 +9936b8f380c2937bb457ade468bfc7dc850293f9 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683376 +1000 [lazygit undo]: updating HEAD +9d187b7f4819a69996dd27e3d66a5224e05d9f41 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683377 +1000 [lazygit undo]: updating HEAD +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683377 +1000 [lazygit undo]: updating HEAD +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683379 +1000 [lazygit redo]: updating HEAD diff --git a/test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..7b49f493a --- /dev/null +++ b/test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,11 @@ +0000000000000000000000000000000000000000 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 branch: Created from HEAD +fcf46511d7819220e0cc310ae6d891fadfdb79aa 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683370 +1000 commit: file4 +5d2b236ff0e8342ef1e531506f6f99070d53cf25 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683370 +1000 commit: file4 +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683370 +1000 commit: file2 +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (finish): refs/heads/branch2 onto 3e4f2b1aeb076cff592279f94b1f495442690521 +3e4f2b1aeb076cff592279f94b1f495442690521 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (finish): refs/heads/branch2 onto fcf46511d7819220e0cc310ae6d891fadfdb79aa +9d187b7f4819a69996dd27e3d66a5224e05d9f41 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (finish): refs/heads/branch2 onto 68ac4e416c01408d37c59465852aa1856a4abdb1 +9936b8f380c2937bb457ade468bfc7dc850293f9 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683376 +1000 [lazygit undo]: updating HEAD +9d187b7f4819a69996dd27e3d66a5224e05d9f41 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683377 +1000 [lazygit undo]: updating HEAD +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683377 +1000 [lazygit undo]: updating HEAD +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683379 +1000 [lazygit redo]: updating HEAD diff --git a/test/integration/undo/expected/.git_keep/logs/refs/heads/master b/test/integration/undo/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..e973b2106 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 6d95d7a7842625152ba887482879dfdaf247f591 CI 1617683370 +1000 commit (initial): file0 +6d95d7a7842625152ba887482879dfdaf247f591 4f77a25a15ccca0273baa522f7281727f31ceeb8 CI 1617683370 +1000 commit: file1 +4f77a25a15ccca0273baa522f7281727f31ceeb8 68ac4e416c01408d37c59465852aa1856a4abdb1 CI 1617683370 +1000 commit: file2 +68ac4e416c01408d37c59465852aa1856a4abdb1 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 commit: file4 diff --git a/test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 b/test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 new file mode 100644 index 0000000000000000000000000000000000000000..171f5e1db62c604c0f6f6ace10e5366c31494765 GIT binary patch literal 147 zcmV;E0Brww0gcW}3c@fHKvBn8MdpIMPxAv2p`$J%N#DalV@rwP^6e6wUe4gwt+l0F zOmyjoh~>EuM6V%2!K$7~q*6jeQBE!)=a>r>v*$zJ-MX0yu~!9&Jdh}gV|3uvYf2Dc zc3hR5$)En(4m(cvK2A^h=C-eLt6O_m^cZ|(4q&ec0OqXcRF^-w(Pfpv`~WYtIQV~P BNL~N{ literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 b/test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 new file mode 100644 index 000000000..03e728678 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 @@ -0,0 +1,2 @@ +xA + @Ѯ=BqFQ(U1& =~sn?ou[׹[xG8&լ겨OmR[0- "NsiEn1OmF{gʺ/@gg3g=z6/] 9 \ No newline at end of file diff --git a/test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 b/test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 new file mode 100644 index 0000000000000000000000000000000000000000..a5b4f0d4e283fed559b9a908ac8608bad7f1f9cb GIT binary patch literal 147 zcmV;E0Brww0gcX03c@fDhGEw^MfQTsYyt}SkUGRuQkH%oYY!OI8NfTBo zwd6PvDf;x+e(HJA_j!5Bm)fz(jraD@7%+x3vY@XB0BWq`RF^-ws_Q0B{Q%KdIy{-F BNqztT literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 b/test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 new file mode 100644 index 0000000000000000000000000000000000000000..f1bf22f4dc827c4402584a4498426c0f3ed488f5 GIT binary patch literal 146 zcmV;D0B!$x0gaA93c@fD06pgwxeJornC=Q9LQj3hX0yRUV@rwP^X(J74#P0Iwl;SU zH$3&-%-@VzC=}(wSPDwbwWI(vSS2=K#+Vh=ZL-_D`)ef4vw#6>Gwugt|$a9Po{24+B?x4q1w?B1P=f%+d0NATK95W?G AzW@LL literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 b/test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 new file mode 100644 index 0000000000000000000000000000000000000000..5dd318b9712a36232ccac497d114f6e70da2bbc7 GIT binary patch literal 119 zcmV--0Eqv10gcT;3c@fDMq$@E#q0%{NyelB5uvLdBWeC%p`oQj@c8x!ZXX}Kd24Oy zB&wHw03>kmA;%a?mV5B22*5+GTG{4OZG=WuYtpB`w}Zxs9^>@FH?@7mZQk0G#7ppl ZbAjn9%xunjPCEYNrY(<)R zttYtjL&Qo-7y-CK&gf>4!l*)7IVjJVBvB5Y*zA1ByW2s6Lh&rcC9JBE01_#M;x$kV z0gzk-Z}`(++hNDa-pA=FUvB#rf-^_=SRCpWsR0_F!^pgACS CDoK3+ literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 0000000000000000000000000000000000000000..2920ab335181ed440a54f52297d3cb1ab3a70222 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 b/test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 new file mode 100644 index 0000000000000000000000000000000000000000..aeb252f851f89d126242aaf7006489938b49d3bc GIT binary patch literal 153 zcmV;K0A~Mq0fmmc3d1lA06Y6Dycde)hb%)Wg-rPj*^y}=ZbEROpWh7GI~^Q1Tv=P2 zyM~l5eHYPg%GMCpNG3z6=&VSw2>_(J6cRWl&Ni!!cX@Y>#KnsTEC#%x$;A?q$3Vd{ z0|jKydCH*p(_ibZhf&{$@hM+!+akBJwuc6Uh~!)}`U=Jvb=YI7%b(nzxvKLbUY+;> Hy&pQ=m=;Mn literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 b/test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 new file mode 100644 index 0000000000000000000000000000000000000000..e1d183bb8f7b5dcb65e84f100c9252d08ec8a6a5 GIT binary patch literal 150 zcmV;H0BQet0fmms3c@fD06pg`au;Mb+vWixLQnmSO|pvxV@rwP=i7sKufs4*SzBAW z#pF(X7qL{cgXlFx$XL{q6Dcksq9~;?A#vpFve|f-SGQVp@FQXk@n|>@D1{JMe2oc} ztJWM6v*CAtth=3Nd!6RHe7J2-xsPx# literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 0000000000000000000000000000000000000000..01ce23cee261a5c479d905ee8318e897bf4bca8f GIT binary patch literal 30 mcmb~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch 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^ literal 0 HcmV?d00001 diff --git a/test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa b/test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa new file mode 100644 index 000000000..35d0eab8b --- /dev/null +++ b/test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa @@ -0,0 +1,3 @@ +xA + @Ѯ=BqtJ)dc & =~sn?oekmCNa~kJp>ij'gv>m"T$Ă)R@11r*vaa|۾M ' +!;{99OneU4?O9- \ No newline at end of file diff --git a/test/integration/undo/expected/.git_keep/refs/heads/branch2 b/test/integration/undo/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..f152723fe --- /dev/null +++ b/test/integration/undo/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +3e4f2b1aeb076cff592279f94b1f495442690521 diff --git a/test/integration/undo/expected/.git_keep/refs/heads/master b/test/integration/undo/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..c4d4b22b4 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +fcf46511d7819220e0cc310ae6d891fadfdb79aa diff --git a/test/integration/undo/expected/file0 b/test/integration/undo/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/undo/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/undo/expected/file1 b/test/integration/undo/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/undo/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/undo/expected/file2 b/test/integration/undo/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/undo/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/undo/expected/file4 b/test/integration/undo/expected/file4 new file mode 100644 index 000000000..0c2aa38e0 --- /dev/null +++ b/test/integration/undo/expected/file4 @@ -0,0 +1,3 @@ +line one +line two +line three diff --git a/test/integration/undo/recording.json b/test/integration/undo/recording.json new file mode 100644 index 000000000..3c4161386 --- /dev/null +++ b/test/integration/undo/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":627,"Mod":0,"Key":259,"Ch":0},{"Timestamp":979,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1443,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1723,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2411,"Mod":0,"Key":256,"Ch":102},{"Timestamp":2811,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3515,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3994,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5490,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6490,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7387,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8428,"Mod":2,"Key":26,"Ch":26},{"Timestamp":9234,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/undo/setup.sh b/test/integration/undo/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/undo/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +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/undo/test.json b/test/integration/undo/test.json new file mode 100644 index 000000000..2fe536d46 --- /dev/null +++ b/test/integration/undo/test.json @@ -0,0 +1 @@ +{ "description": "undoing some changes to commits", "speed": 10 } diff --git a/test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/undo2/expected/.git_keep/FETCH_HEAD b/test/integration/undo2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/undo2/expected/.git_keep/HEAD b/test/integration/undo2/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/undo2/expected/.git_keep/ORIG_HEAD b/test/integration/undo2/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..064ef4565 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +481ce2cf9d037b83acb1d452973695764bf7b95e diff --git a/test/integration/undo2/expected/.git_keep/config b/test/integration/undo2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/undo2/expected/.git_keep/description b/test/integration/undo2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/undo2/expected/.git_keep/index b/test/integration/undo2/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..0385f0c7ecee52fe318607af8532af25eac52e9d GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1plETWo|*28E=F1`6^?^M%U46JFHIjIIfX$A(6ele>%Aut+hP87O1OZPnftD1V_OGIcCPrlQI z0I!zrs}OSxVdn5L9BT*!nggaG=J?y7nB=N-?^8o7KK;!x4hDxZ=nt`#|UN) zKetwe70?_o4K>FN%^Xf$hP?rig)8ZuzFX}WmeM)F~ 1617683460 +1000 commit (initial): file0 +8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 +a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 checkout: moving from master to branch2 +a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 +df1876c035ade1ba199afadd399a6d4273190cd8 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683461 +1000 checkout: moving from branch2 to master +a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (start): checkout bce6c0c795a3d37c0a2c382a6d9c146b1889f86c +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): returning to refs/heads/master +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (start): checkout 0e2680a41392859e5159716b50525850017c6a59 +0e2680a41392859e5159716b50525850017c6a59 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): returning to refs/heads/master +0e2680a41392859e5159716b50525850017c6a59 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683464 +1000 checkout: moving from master to branch2 +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (start): checkout e51d8e24ead991fdd7fd9b9d90924c2e24576981 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): returning to refs/heads/branch2 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (start): checkout 481ce2cf9d037b83acb1d452973695764bf7b95e +481ce2cf9d037b83acb1d452973695764bf7b95e 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): returning to refs/heads/branch2 +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD +df1876c035ade1ba199afadd399a6d4273190cd8 0e2680a41392859e5159716b50525850017c6a59 CI 1617683467 +1000 [lazygit undo] +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD +a3bf51bf610771f997de1d3f313ab7c43e20bef5 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683469 +1000 [lazygit undo] +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD +481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD +a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo] diff --git a/test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..692281b19 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,11 @@ +0000000000000000000000000000000000000000 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 branch: Created from HEAD +a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): refs/heads/branch2 onto e51d8e24ead991fdd7fd9b9d90924c2e24576981 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): refs/heads/branch2 onto 481ce2cf9d037b83acb1d452973695764bf7b95e +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD +481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/.git_keep/logs/refs/heads/master b/test/integration/undo2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..805835942 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,8 @@ +0000000000000000000000000000000000000000 8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 CI 1617683460 +1000 commit (initial): file0 +8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 +a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): refs/heads/master onto bce6c0c795a3d37c0a2c382a6d9c146b1889f86c +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): refs/heads/master onto 0e2680a41392859e5159716b50525850017c6a59 +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 b/test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 new file mode 100644 index 000000000..dab8fd41a --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 @@ -0,0 +1,2 @@ +x; +0 @; EGBCeH\#ty Ou.P(,̮zj$.U(wzdѓ88&!$𧿶Sd[ egnڼ(9 \ No newline at end of file diff --git a/test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e b/test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e new file mode 100644 index 000000000..a4ba62ac1 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e @@ -0,0 +1,2 @@ +xA + @Ѯ=BqIBV9ƨ# & =~sn?o-U; r x@Y4 Dr[T#B$q`_aާ_iň'7uY՛n: \ No newline at end of file diff --git a/test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 b/test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 new file mode 100644 index 0000000000000000000000000000000000000000..e5028f911022d2b071f22b9d57caae7f23b28969 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NynrC5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lDl^?3&3M4TG*ysY=8z;YvQNB+drapK)L YsAIYcGn=!Xla4>RDeDF{Kij)2?p``L4*&oF literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 0000000000000000000000000000000000000000..2920ab335181ed440a54f52297d3cb1ab3a70222 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 b/test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 new file mode 100644 index 0000000000000000000000000000000000000000..751b9844f3079311dd7fc1ff7036c399b43ac200 GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSB{w5O;5xVLzCesNPT3bp4k8h9Q_VF#AZ0kCA z>x#ehL)E6jpi)R3#VnltBq7zzl`6%Se6GmN6PTS3eRo?$Q9yD@9Hx*3*h?VKI2Cab zt0O9nPz-P+WRm*^~>wN=uNiuVI8`R6e5DXIsh`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c b/test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c new file mode 100644 index 0000000000000000000000000000000000000000..bc5e863f8f4bc259171bea4e14410ad08f422304 GIT binary patch literal 147 zcmV;E0Brww0gaA93c@fDMP26<*$Xl=?IaTr5xVLz(qw{##+DMnZoWtfG`GagM;^Hregny$zt*Fq$YcRMk|KXI2i3vEX5b zM4Z9Nr$5)-kCVTR)5E^fwwGPX+U_0*66I^8;Li|3a0fl6y8W5Ey1WeC52>O##(F(V AApigX literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 b/test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 new file mode 100644 index 0000000000000000000000000000000000000000..d784921aac901108b62c250da2679bea8fdba127 GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSZGWi=25xVLzGU)^hjV&R9$G1mt`}h{G?5(Xs z1KG>yA{rOACWRW4VJJ1A6)BbgKq`_az??E$R!8pg9@-@+VoRmPVC00kFf7hniWtbp z;J8L6FDie=YwvoR^?jP3^3Cnop3;#Pp;~^iBmsK0y#K6 C`9zQa literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 0000000000000000000000000000000000000000..01ce23cee261a5c479d905ee8318e897bf4bca8f GIT binary patch literal 30 mcmb~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch 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^ literal 0 HcmV?d00001 diff --git a/test/integration/undo2/expected/.git_keep/refs/heads/branch2 b/test/integration/undo2/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..fe4f6f367 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/.git_keep/refs/heads/master b/test/integration/undo2/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..fe4f6f367 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/file0 b/test/integration/undo2/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/undo2/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/undo2/expected/file1 b/test/integration/undo2/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/undo2/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/undo2/expected/file2 b/test/integration/undo2/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/undo2/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/undo2/expected/file4 b/test/integration/undo2/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/undo2/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/undo2/recording.json b/test/integration/undo2/recording.json new file mode 100644 index 000000000..c9398dfa5 --- /dev/null +++ b/test/integration/undo2/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":647,"Mod":0,"Key":259,"Ch":0},{"Timestamp":917,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1245,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1646,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1957,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2205,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2533,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2765,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3141,"Mod":0,"Key":260,"Ch":0},{"Timestamp":3397,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3637,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3933,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4780,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5205,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5405,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5685,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5877,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6277,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6725,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7317,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7845,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8372,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8885,"Mod":0,"Key":256,"Ch":122},{"Timestamp":9469,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10069,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10645,"Mod":0,"Key":256,"Ch":122},{"Timestamp":11189,"Mod":0,"Key":256,"Ch":122},{"Timestamp":12077,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/undo2/setup.sh b/test/integration/undo2/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/undo2/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +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/undo2/test.json b/test/integration/undo2/test.json new file mode 100644 index 000000000..ade09ab38 --- /dev/null +++ b/test/integration/undo2/test.json @@ -0,0 +1 @@ +{ "description": "undoing changes in both commits and branches", "speed": 10 }