From 7b757d1cfe88363aa52a660d53838478243eca00 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 22 Aug 2022 20:43:19 +1000 Subject: [PATCH] add branch rebase integration test --- cmd/integration_test/main.go | 17 +++- pkg/integration/README.md | 6 +- pkg/integration/clients/cli.go | 11 +- pkg/integration/components/shell.go | 16 +++ pkg/integration/tests/branch/rebase.go | 94 ++++++++++++++++++ .../tests/branch/rebase_and_drop.go | 63 ++++++++++++ pkg/integration/tests/tests.go | 2 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 18 ---- .../branchRebase/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/index | Bin 835 -> 0 bytes .../expected/repo/.git_keep/logs/HEAD | 22 ---- .../repo/.git_keep/logs/refs/heads/develop | 5 - .../repo/.git_keep/logs/refs/heads/master | 6 -- .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 112 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 50 -> 0 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 117 -> 0 bytes .../2e/83133d8d6b88c588de66c3ff8405501b5215b4 | Bin 74 -> 0 bytes .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 120 -> 0 bytes .../36/27f93f3cc779dc2f99484fb8ffa49953e43b2f | Bin 121 -> 0 bytes .../3e/1706cdf670f5641be0715178471abfc9ed1748 | 2 - .../42/1b29bba240f23ea39e216bb0873cd4012624b5 | Bin 120 -> 0 bytes .../42/597904331c82f6d5c8c902755c8dfa5767ea95 | Bin 160 -> 0 bytes .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 - .../5d/874a902548f753e50944827e572a7470aa9731 | Bin 107 -> 0 bytes .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 86 -> 0 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 54 -> 0 bytes .../69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 | Bin 157 -> 0 bytes .../70/95508e3cd0fd40572f8e711170db38ef2342d7 | Bin 160 -> 0 bytes .../7a/45b8933308e43f2597ee5d290862a62a9b46b3 | Bin 111 -> 0 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 65 -> 0 bytes .../8c/7a45270a95d66c8e3b843df3f466be5dc19960 | Bin 117 -> 0 bytes .../8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 | 2 - .../9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 | 3 - .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 54 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a8/381c9130b03aef530b60b5a4546b93dc59ae12 | 2 - .../cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 | Bin 120 -> 0 bytes .../cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f | 6 -- .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 - .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 50 -> 0 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 86 -> 0 bytes .../e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 | Bin 159 -> 0 bytes .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 54 -> 0 bytes .../f5/067da83b48f8588edce682fd2715a575f34373 | 4 - .../fe/427b52bbbe9dac81b463a162f37ab979ca772b | Bin 85 -> 0 bytes .../repo/.git_keep/refs/heads/develop | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../branchRebase/expected/repo/directory/file | 1 - .../expected/repo/directory/file2 | 1 - .../branchRebase/expected/repo/file1 | 63 ------------ .../branchRebase/expected/repo/file3 | 1 - .../branchRebase/expected/repo/file4 | 1 - .../branchRebase/expected/repo/file5 | 1 - test/integration/branchRebase/recording.json | 1 - test/integration/branchRebase/setup.sh | 85 ---------------- test/integration/branchRebase/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../rebase/expected/repo/.git_keep/HEAD | 1 + .../rebase/expected/repo/.git_keep/MERGE_MSG | 4 + .../rebase/expected/repo/.git_keep/ORIG_HEAD | 1 + .../expected/repo/.git_keep/REBASE_HEAD | 1 + .../rebase}/expected/repo/.git_keep/config | 2 + .../expected/repo/.git_keep/description | 0 .../rebase/expected/repo/.git_keep/index | Bin 0 -> 212 bytes .../expected/repo/.git_keep/info/exclude | 0 .../rebase/expected/repo/.git_keep/logs/HEAD | 13 +++ .../logs/refs/heads/first-change-branch | 3 + .../.git_keep/logs/refs/heads/original-branch | 4 + .../logs/refs/heads/second-change-branch | 3 + .../00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 | Bin 0 -> 49 bytes .../02/27353d56e56df9e9f94559f90b86ce7aa1ca5c | 2 + .../11/0d6e0b946c9d9b9b5e44c29d98692e925c368c | Bin 0 -> 48 bytes .../16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 | Bin 0 -> 46 bytes .../1f/332f64cb03c06913491af20cd407158776bd55 | Bin 0 -> 49 bytes .../3a/ac30738b0dda38d964abe6c2386603f9309a65 | Bin 0 -> 43 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../4c/16472189d1db34cb67b99439725202216e26d9 | Bin 0 -> 41 bytes .../4c/66ef64d685d244db41efda29deffb381c46c3d | Bin 0 -> 148 bytes .../55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37 | Bin 0 -> 170 bytes .../70/2b646c08ba47b2ac5729deed77188ef1647b4d | 2 + .../ab/1329d5c536f369c741c65fab7cca4ab27dc22e | Bin 0 -> 85 bytes .../b8/27df09781d0648f66cd9a01f0ec0ad5d412e10 | Bin 0 -> 150 bytes .../d7/149d98e6da25303f9a8cdff131da4b0723a412 | Bin 0 -> 147 bytes .../f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2 | Bin 0 -> 154 bytes .../.git_keep/refs/heads/first-change-branch | 1 + .../repo/.git_keep/refs/heads/original-branch | 1 + .../.git_keep/refs/heads/second-change-branch | 1 + .../branch/rebase/expected/repo/file | 6 ++ .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 + .../expected/repo/.git_keep/ORIG_HEAD | 1 + .../expected/repo/.git_keep/config | 12 +++ .../expected/repo/.git_keep/description | 1 + .../expected/repo/.git_keep/index | Bin 0 -> 212 bytes .../expected/repo/.git_keep/info/exclude | 7 ++ .../expected/repo/.git_keep/logs/HEAD | 16 +++ .../logs/refs/heads/first-change-branch | 5 + .../.git_keep/logs/refs/heads/original-branch | 4 + .../logs/refs/heads/second-change-branch | 3 + .../00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 | Bin 0 -> 49 bytes .../11/0d6e0b946c9d9b9b5e44c29d98692e925c368c | Bin 0 -> 48 bytes .../16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 | Bin 0 -> 46 bytes .../1f/332f64cb03c06913491af20cd407158776bd55 | Bin 0 -> 49 bytes .../32/28c73cfc742264f3101966a81d6a0a70488e36 | Bin 0 -> 167 bytes .../39/129f24587bdc648e1fdb6f0b089c0846f54d45 | 2 + .../3a/ac30738b0dda38d964abe6c2386603f9309a65 | Bin 0 -> 43 bytes .../3f/c37a0e51435e01769aa25e6fe7179add2642a6 | Bin 0 -> 154 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../4c/16472189d1db34cb67b99439725202216e26d9 | Bin 0 -> 41 bytes .../55/87edfe46cfc076fb9ff4db76d196965838669a | 2 + .../7b/e86fe92edea93469924da2c241943adddd27cc | Bin 0 -> 85 bytes .../7c/0af051757503c84800076fd34851ea8b81e415 | Bin 0 -> 147 bytes .../99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 | Bin 0 -> 152 bytes .../9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc | Bin 0 -> 146 bytes .../ab/5816052b05d45683d9fd3aa85203995b66cd65 | Bin 0 -> 117 bytes .../b5/6a14235fe8b10e5cca38d8b8009899d60b6499 | Bin 0 -> 149 bytes .../c0/66f8c513a34cd0c63e54c3b418a50491686cff | Bin 0 -> 151 bytes .../.git_keep/refs/heads/first-change-branch | 1 + .../repo/.git_keep/refs/heads/original-branch | 1 + .../.git_keep/refs/heads/second-change-branch | 1 + .../branch/rebase_and_drop/expected/repo/file | 6 ++ 126 files changed, 309 insertions(+), 241 deletions(-) create mode 100644 pkg/integration/tests/branch/rebase.go create mode 100644 pkg/integration/tests/branch/rebase_and_drop.go delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/index delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop delete mode 100644 test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/branchRebase/expected/repo/directory/file delete mode 100644 test/integration/branchRebase/expected/repo/directory/file2 delete mode 100644 test/integration/branchRebase/expected/repo/file1 delete mode 100644 test/integration/branchRebase/expected/repo/file3 delete mode 100644 test/integration/branchRebase/expected/repo/file4 delete mode 100644 test/integration/branchRebase/expected/repo/file5 delete mode 100644 test/integration/branchRebase/recording.json delete mode 100644 test/integration/branchRebase/setup.sh delete mode 100644 test/integration/branchRebase/test.json create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG rename test/{integration/branchRebase => integration_new/branch/rebase}/expected/repo/.git_keep/FETCH_HEAD (100%) create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD rename test/{integration/branchRebase => integration_new/branch/rebase}/expected/repo/.git_keep/config (87%) rename test/{integration/branchRebase => integration_new/branch/rebase}/expected/repo/.git_keep/description (100%) create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/index rename test/{integration/branchRebase => integration_new/branch/rebase}/expected/repo/.git_keep/info/exclude (100%) create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/02/27353d56e56df9e9f94559f90b86ce7aa1ca5c create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/70/2b646c08ba47b2ac5729deed77188ef1647b4d create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/ab/1329d5c536f369c741c65fab7cca4ab27dc22e create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/b8/27df09781d0648f66cd9a01f0ec0ad5d412e10 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2 create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch create mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch create mode 100644 test/integration_new/branch/rebase/expected/repo/file create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/32/28c73cfc742264f3101966a81d6a0a70488e36 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/39/129f24587bdc648e1fdb6f0b089c0846f54d45 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch create mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/file diff --git a/cmd/integration_test/main.go b/cmd/integration_test/main.go index 83321fc34..dc0cede86 100644 --- a/cmd/integration_test/main.go +++ b/cmd/integration_test/main.go @@ -13,7 +13,7 @@ Usage: See https://github.com/jesseduffield/lazygit/tree/master/pkg/integration/README.md CLI mode: - > go run cmd/integration_test/main.go cli [--slow] ... + > go run cmd/integration_test/main.go cli [--slow] [--sandbox] ... If you pass no test names, it runs all tests Accepted environment variables: KEY_PRESS_DELAY (e.g. 200): the number of milliseconds to wait between keypresses @@ -42,12 +42,19 @@ func main() { case "cli": testNames := os.Args[2:] slow := false + sandbox := false // get the next arg if it's --slow - if len(os.Args) > 2 && (os.Args[2] == "--slow" || os.Args[2] == "-slow") { - testNames = os.Args[3:] - slow = true + if len(os.Args) > 2 { + if os.Args[2] == "--slow" || os.Args[2] == "-slow" { + testNames = os.Args[3:] + slow = true + } else if os.Args[2] == "--sandbox" || os.Args[2] == "-sandbox" { + testNames = os.Args[3:] + sandbox = true + } } - clients.RunCLI(testNames, slow) + + clients.RunCLI(testNames, slow, sandbox) case "tui": clients.RunTUI() default: diff --git a/pkg/integration/README.md b/pkg/integration/README.md index 916149cea..4b745895a 100644 --- a/pkg/integration/README.md +++ b/pkg/integration/README.md @@ -11,7 +11,7 @@ go run cmd/integration_test/main.go tui or ```sh -go run cmd/integration_test/main.go cli [--slow] [testname or testpath...] +go run cmd/integration_test/main.go cli [--slow or --sandbox] [testname or testpath...] ``` ## Writing tests @@ -49,7 +49,7 @@ If you find yourself doing something frequently in a test, consider making it a There are three ways to invoke a test: -1. go run cmd/integration_test/main.go cli [--slow] [testname or testpath...] +1. go run cmd/integration_test/main.go cli [--slow or --sandbox] [testname or testpath...] 2. go run cmd/integration_test/main.go tui 3. go test pkg/integration/clients/go_test.go @@ -69,7 +69,7 @@ At the moment (this is subject to change) each test has a snapshot repo created Say you want to do a manual test of how lazygit handles merge-conflicts, but you can't be bothered actually finding a way to create merge conflicts in a repo. To make your life easier, you can simply run a merge-conflicts test in sandbox mode, meaning the setup step is run for you, and then instead of the test driving the lazygit session, you're allowed to drive it yourself. -To run a test in sandbox mode you can press 's' on a test in the test TUI or pass the env var MODE=sandbox to the test runner. +To run a test in sandbox mode you can press 's' on a test in the test TUI or in the test runner pass MODE=sandbox or the --sandbox argument. ## Migration process diff --git a/pkg/integration/clients/cli.go b/pkg/integration/clients/cli.go index 17c379c85..0222bd129 100644 --- a/pkg/integration/clients/cli.go +++ b/pkg/integration/clients/cli.go @@ -23,18 +23,25 @@ import ( // If invoked directly, you can specify tests to run by passing their names as positional arguments -func RunCLI(testNames []string, slow bool) { +func RunCLI(testNames []string, slow bool, sandbox bool) { keyPressDelay := tryConvert(os.Getenv("KEY_PRESS_DELAY"), 0) if slow { keyPressDelay = SLOW_KEY_PRESS_DELAY } + var mode components.Mode + if sandbox { + mode = components.SANDBOX + } else { + mode = getModeFromEnv() + } + err := components.RunTests( getTestsToRun(testNames), log.Printf, runCmdInTerminal, runAndPrintFatalError, - getModeFromEnv(), + mode, keyPressDelay, ) if err != nil { diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 7b7a68543..b49921348 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -40,6 +40,15 @@ func (s *Shell) CreateFile(path string, content string) *Shell { return s } +func (s *Shell) UpdateFile(path string, content string) *Shell { + err := ioutil.WriteFile(path, []byte(content), 0o644) + if err != nil { + panic(fmt.Sprintf("error updating file: %s\n%s", path, err)) + } + + return s +} + func (s *Shell) NewBranch(name string) *Shell { return s.RunCommand("git checkout -b " + name) } @@ -71,6 +80,13 @@ func (s *Shell) CreateFileAndAdd(fileName string, fileContents string) *Shell { GitAdd(fileName) } +// convenience method for updating a file and adding it +func (s *Shell) UpdateFileAndAdd(fileName string, fileContents string) *Shell { + return s. + UpdateFile(fileName, fileContents). + GitAdd(fileName) +} + // creates commits 01, 02, 03, ..., n with a new file in each // The reason for padding with zeroes is so that it's easier to do string // matches on the commit messages when there are many of them diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go new file mode 100644 index 000000000..eda7567e7 --- /dev/null +++ b/pkg/integration/tests/branch/rebase.go @@ -0,0 +1,94 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var originalFileContent = ` +This +Is +The +Original +File +` + +var firstChangeFileContent = ` +This +Is +The +First Change +File +` + +var secondChangeFileContent = ` +This +Is +The +Second Change +File +` + +// prepares us for a rebase that has conflicts +var commonRebaseSetup = func(shell *Shell) { + shell. + NewBranch("original-branch"). + EmptyCommit("one"). + EmptyCommit("two"). + EmptyCommit("three"). + CreateFileAndAdd("file", originalFileContent). + Commit("original"). + NewBranch("first-change-branch"). + UpdateFileAndAdd("file", firstChangeFileContent). + Commit("first change"). + Checkout("original-branch"). + NewBranch("second-change-branch"). + UpdateFileAndAdd("file", secondChangeFileContent). + Commit("second change"). + EmptyCommit("second-change-branch unrelated change"). + Checkout("first-change-branch") +} + +var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Rebase onto another branch, deal with the conflicts.", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + commonRebaseSetup(shell) + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + input.SwitchToBranchesWindow() + assert.CurrentViewName("localBranches") + + assert.MatchSelectedLine(Contains("first-change-branch")) + input.NextItem() + assert.MatchSelectedLine(Contains("second-change-branch")) + input.PressKeys(keys.Branches.RebaseBranch) + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) + input.Confirm() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("Conflicts!")) + input.Confirm() + + assert.CurrentViewName("files") + assert.MatchSelectedLine(Contains("file")) + + // not using Confirm() convenience method because I suspect we might change this + // keybinding to something more bespoke + input.PressKeys(keys.Universal.Confirm) + + assert.CurrentViewName("mergeConflicts") + input.PrimaryAction() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("all merge conflicts resolved. Continue?")) + input.Confirm() + + // this proves we actually have integrated the changes from second-change-branch + assert.MatchViewContent("commits", Contains("second-change-branch unrelated change")) + }, +}) diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go new file mode 100644 index 000000000..18ffdd820 --- /dev/null +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -0,0 +1,63 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Rebase onto another branch, deal with the conflicts. Also mark a commit to be dropped before continuing.", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + commonRebaseSetup(shell) + // addin a couple additional commits so that we can drop one + shell.EmptyCommit("to drop") + shell.EmptyCommit("to keep") + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + input.SwitchToBranchesWindow() + assert.CurrentViewName("localBranches") + + assert.MatchSelectedLine(Contains("first-change-branch")) + input.NextItem() + assert.MatchSelectedLine(Contains("second-change-branch")) + input.PressKeys(keys.Branches.RebaseBranch) + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) + input.Confirm() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("Conflicts!")) + input.Confirm() + + assert.CurrentViewName("files") + assert.MatchSelectedLine(Contains("file")) + + input.SwitchToCommitsWindow() + input.NextItem() + input.PressKeys(keys.Universal.Remove) + assert.MatchSelectedLine(Contains("to drop")) + assert.MatchSelectedLine(Contains("drop")) + + input.SwitchToFilesWindow() + + // not using Confirm() convenience method because I suspect we might change this + // keybinding to something more bespoke + input.PressKeys(keys.Universal.Confirm) + + assert.CurrentViewName("mergeConflicts") + input.PrimaryAction() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("all merge conflicts resolved. Continue?")) + input.Confirm() + + // this proves we actually have integrated the changes from second-change-branch + assert.MatchViewContent("commits", Contains("second-change-branch unrelated change")) + assert.MatchViewContent("commits", Contains("to keep")) + assert.MatchViewContent("commits", NotContains("to drop")) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index 88f6b40da..0721fbf17 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -25,6 +25,8 @@ var tests = []*components.IntegrationTest{ commit.NewBranch, branch.Suggestions, branch.Delete, + branch.Rebase, + branch.RebaseAndDrop, interactive_rebase.One, custom_commands.Basic, custom_commands.MultiplePrompts, diff --git a/test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 42bf03720..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,18 +0,0 @@ -first commit on master - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# interactive rebase in progress; onto e957aaf -# Last command done (1 command done): -# pick 69f11ae first commit on master -# Next commands to do (3 remaining commands): -# drop 8d3bd1c second commit on master -# drop 3e1706c third commit on master -# You are currently rebasing branch 'master' on 'e957aaf'. -# -# Changes to be committed: -# modified: directory/file -# modified: directory/file2 -# modified: file1 -# diff --git a/test/integration/branchRebase/expected/repo/.git_keep/HEAD b/test/integration/branchRebase/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD b/test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 28cab2e49..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/index b/test/integration/branchRebase/expected/repo/.git_keep/index deleted file mode 100644 index 12d7435870d424e61c2a979e02a8af94870c5210..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 835 zcmZ?q402{*U|<4bw#1J@3R3NvD?qfQddfpa1_o9p%^BYr7#f!_Ffe`vsu2OHyPwUg zeWvW$8~#%YhtvhU{55tRk!Ija$t+4uF3B&d)KAOINd>B70GT8G`Gq9d+==d-Q1gBe zWgb7Oc}7t4WHT)X{rm?Dk)es-H?G5dpHwJ%N7_egPQXT)f@(8=~+*|-v4H}Yn23-!TOss?3?eXpMscU3^zx?VR<9S zJ#ud@%!iuun|O0f;N~dq5fA{Gqu^ux6>82O;>|Gyn-db`>I!67GngqDaydzB?q1~Z z$!_sH#q163Hdh$cRJOu{l)*^Bfa~-3r1dVE>pFk&uCwKe4&YfRW^g3PH58Z}7$x8; zA(3flU|?oq!hlLG-ShabYU+(I5us5$`A!!Cyjr@iO7Q$JYEasD?&YdQ;Z^-Due9e| zsAEemsOB4?nGCgu5(^-)jp|@1ujBBXJDMk_{&={|=B&r_-PdmB?AYPo@P? G^c4VB(IfHz diff --git a/test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD b/test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index e4a5b4d7a..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,22 +0,0 @@ -0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from master to develop -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop -9a6521a3788b4d9e679b1709130ff8dc3f73ab18 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from develop to master -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 checkout: moving from master to develop -9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop -a8381c9130b03aef530b60b5a4546b93dc59ae12 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 checkout: moving from develop to master -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master -8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 checkout: moving from master to develop -a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop -7095508e3cd0fd40572f8e711170db38ef2342d7 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 checkout: moving from develop to master -8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master -3e1706cdf670f5641be0715178471abfc9ed1748 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 checkout: moving from master to develop -7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 checkout: moving from develop to master -3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master -f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188756 +1100 rebase -i (start): checkout develop -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188757 +1100 rebase -i (abort): updating HEAD -f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188758 +1100 rebase -i (start): checkout develop -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (continue): first commit on master -42597904331c82f6d5c8c902755c8dfa5767ea95 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 06dc78ae9..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 branch: Created from HEAD -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop -9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop -a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop -7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop diff --git a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 1856f13e4..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master -8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master -3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master -f5067da83b48f8588edce682fd2715a575f34373 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): refs/heads/master onto e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e2f8c317030a30193aef9945f0c8afa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmV-$0FVE80V^p=O;s>7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d14b4aef3343737214a03a09457e21e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26067e0a43b68d14777da3f61ddfcceac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 b/test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 deleted file mode 100644 index 7cc212f4ecbf69faeec76ef317216317aa8802b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74 zcmV-Q0JZ;k0ZYosPf{>9Ww3z&1rJw87p{`j;u0e+TL=L2jJfO}K*7v1&CoD0RZmY( gAuY40xI`g2KQ}kCL?J&7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0y)b()Nz*@dXIp(Y_*L!;cu_CK&0aUq diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 b/test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 deleted file mode 100644 index fcb375444..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0a9II2cLiR#x| ^VawL 6ZP HVg.Tl*&9Re@)%Xﾴ t! GkC8:T?s՗u/SОPu`.? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 b/test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 deleted file mode 100644 index 6ad1bf9cd75b1cd31f6c5468ced101f2724b08d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Z?cCQJl9^ZqXa=J9tg=>`*teS3!q`;U#de+mg_rDqLS|!0{ au>R%@`{q09r;rqw5K>@@RRI9XC`L=mVLLSd diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 b/test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 deleted file mode 100644 index 1c62a22417fe7847281aa92803041b707346a5e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0ey}^3c@fD06pgwdlzK0*`x`G2tD-~n{(@Krt^DXGv>o5aT)>`KV zgz3;WRbaB2QqDq*6FC)^lx)ZuW9Q1qXekh9ZyvJg(m<2%L?%+5u%MHKo-%hdatt&k z)eyNj^+sOpwr(4Gq}dp9<87~X|IUedoJJteuO~6%SXa40pmOk z3s=V0KxiuUhGtS^Y6#2)Dtol3O3%rhL5Z7_vNHN9#VFklej8i4j3TV0&U^nWeH~Kd NeFssJdjPfiP{E>uGQ>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/branchRebase/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 deleted file mode 100644 index bfb5376c67ba79deb64b9463958ebd99b0ed9f64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 b/test/integration/branchRebase/expected/repo/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 deleted file mode 100644 index 71f3f42ac0e10791c292c17373fd390595618d79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaA93c@fDMP26xEG;CGYu>tT0m`nS)3q zX4mge1k5!L~w) LN0-$X`5ixS{X|NQ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 b/test/integration/branchRebase/expected/repo/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 deleted file mode 100644 index 7d14e4e29bf0883a5c0214316b7aab8b139f96da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0gaAH3d1lE1asCa<{k($)?x`l2>9e@Xc=RJWf`G_JU@bbAh)KeE;^Q+ zw*~{@rB!CIar8`!;MHv%Vr%28j6sNCzH1JkhijE`(l%5yegTbJ? zM48}ZirRUmLHJi&OND8M`!qlKi?(hx!EXiS OfW&X!%PGEZbwB(FR!gJ+ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 b/test/integration/branchRebase/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 deleted file mode 100644 index f6a9427bc10feda765a6bce02de0a2d2eb0977d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmV-#0FeK90V^p=O;s>7Fk&z<00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09rvP{yDhp2XHkSYZ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/branchRebase/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 deleted file mode 100644 index ea7fa53039077c16fa43ab0244a322d4d24fe9f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmb4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do(7Hf1m|00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09r;rqwU{wGBvMe|*sF*nn diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 b/test/integration/branchRebase/expected/repo/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 deleted file mode 100644 index 5083d8258..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F]dDz$A4-x=r-٠#ifv piA*FYWAYae3_-MA" \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86c56c088175e46f1590082f30deb89cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsu`~^A08nuUMF0Q* diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 b/test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 deleted file mode 100644 index 8ed23d6aa..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 +++ /dev/null @@ -1,2 +0,0 @@ -x -0E]+f/H&DyLQMQ| pWs67ɺ̑4ɸD\5Q7i_gRkdwlkbƠ#&@)#귶0yISi[B,V;OuSWO)mˠ-P-/8|? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 b/test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 deleted file mode 100644 index 8f0889223b53c6c44867d32f0da7bd7277bd4121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09r;rqw5K>@@RRI9MxkgfqqB}hR diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f b/test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f deleted file mode 100644 index 0e775a5f8..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f +++ /dev/null @@ -1,6 +0,0 @@ -xQ -@ DS -,* -FڦBw#)MRdLPw5' d􂎤)aP:;%6 -zs[h/6|ZW}7 -ձ/K(V(+'g,7c01 \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c +++ /dev/null @@ -1 +0,0 @@ -x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e deleted file mode 100644 index 3a7ee91eab601eb205b04a6e1e62c58599193222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 deleted file mode 100644 index 83998943a5a68dad92fe592c8b50a4121bd04c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*Rgo)QVHm>~w~Mjo{BoQyOS+3M^i`;0LWX%og6khIu+8Y{D7OGFk^ zP>!=yS|%&}(U;m_n&CdpPyYC_uY8NOJb(tR$T@2?T!|3HNzbXyf9fLFqxA)T8Pp9D Nzj>{@_yPcVK+76MOnm?V diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 deleted file mode 100644 index e9f9f0881a1460f9b019818b1cbd6e4f67fe70aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!>!qSWM){Gv*Rxi8eXi@QvgyBgmQ`SgTEJ!@r> rlc9lunTd%)T4qkFA%lOz8=h*;cdsLOc_gQllpoMO(W43g2J9QllRGE5 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop b/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index d77f4721f..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master b/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 567f6507a..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -42597904331c82f6d5c8c902755c8dfa5767ea95 diff --git a/test/integration/branchRebase/expected/repo/directory/file b/test/integration/branchRebase/expected/repo/directory/file deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/branchRebase/expected/repo/directory/file +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/branchRebase/expected/repo/directory/file2 b/test/integration/branchRebase/expected/repo/directory/file2 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/branchRebase/expected/repo/directory/file2 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/branchRebase/expected/repo/file1 b/test/integration/branchRebase/expected/repo/file1 deleted file mode 100644 index 5d874a902..000000000 --- a/test/integration/branchRebase/expected/repo/file1 +++ /dev/null @@ -1,63 +0,0 @@ -Here is a story that has been told throuhg the ages -once upon a time there was a cat -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another dog diff --git a/test/integration/branchRebase/expected/repo/file3 b/test/integration/branchRebase/expected/repo/file3 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchRebase/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchRebase/expected/repo/file4 b/test/integration/branchRebase/expected/repo/file4 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchRebase/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchRebase/expected/repo/file5 b/test/integration/branchRebase/expected/repo/file5 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchRebase/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchRebase/recording.json b/test/integration/branchRebase/recording.json deleted file mode 100644 index c0da4c16a..000000000 --- a/test/integration/branchRebase/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":617,"Mod":0,"Key":259,"Ch":0},{"Timestamp":922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1176,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1512,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2797,"Mod":0,"Key":27,"Ch":0},{"Timestamp":3632,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4760,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5105,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5376,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5721,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6186,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6401,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6592,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6840,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7105,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7612,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8160,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8680,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9080,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9464,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9808,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10372,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11249,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12088,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/branchRebase/setup.sh b/test/integration/branchRebase/setup.sh deleted file mode 100644 index a1f14b455..000000000 --- a/test/integration/branchRebase/setup.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - - -function add_spacing { - for i in {1..60} - do - echo "..." >> $1 - done -} - -mkdir directory -echo "test1" > directory/file -echo "test1" > directory/file2 - - -echo "Here is a story that has been told throuhg the ages" >> file1 - -git add file1 -git add directory -git commit -m "first commit" - -git checkout -b develop -echo "once upon a time there was a dog" >> file1 -add_spacing file1 -echo "once upon a time there was another dog" >> file1 -git add file1 -echo "test2" > directory/file -echo "test2" > directory/file2 -git add directory -git commit -m "first commit on develop" - - -git checkout master -echo "once upon a time there was a cat" >> file1 -add_spacing file1 -echo "once upon a time there was another cat" >> file1 -git add file1 -echo "test3" > directory/file -echo "test3" > directory/file2 -git add directory -git commit -m "first commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file3 -git add file3 -git commit -m "second commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file3 -git add file3 -git commit -m "second commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file4 -git add file4 -git commit -m "third commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file4 -git add file4 -git commit -m "third commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file5 -git add file5 -git commit -m "fourth commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file5 -git add file5 -git commit -m "fourth commit on master" diff --git a/test/integration/branchRebase/test.json b/test/integration/branchRebase/test.json deleted file mode 100644 index 1082379ed..000000000 --- a/test/integration/branchRebase/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 10 } diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..14bc77d37 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +second-change-branch unrelated change diff --git a/test/integration/branchRebase/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchRebase/expected/repo/.git_keep/FETCH_HEAD rename to test/integration_new/branch/rebase/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..e1c7bf8c5 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG b/test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG new file mode 100644 index 000000000..803d9a2dd --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG @@ -0,0 +1,4 @@ +first change + +# Conflicts: +# file diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..51a54aa1d --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD new file mode 100644 index 000000000..51a54aa1d --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD @@ -0,0 +1 @@ +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/config b/test/integration_new/branch/rebase/expected/repo/.git_keep/config similarity index 87% rename from test/integration/branchRebase/expected/repo/.git_keep/config rename to test/integration_new/branch/rebase/expected/repo/.git_keep/config index 8ae104545..8a748ce32 100644 --- a/test/integration/branchRebase/expected/repo/.git_keep/config +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/config @@ -8,3 +8,5 @@ [user] email = CI@example.com name = CI +[commit] + gpgSign = false diff --git a/test/integration/branchRebase/expected/repo/.git_keep/description b/test/integration_new/branch/rebase/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchRebase/expected/repo/.git_keep/description rename to test/integration_new/branch/rebase/expected/repo/.git_keep/description diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/index b/test/integration_new/branch/rebase/expected/repo/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..b5c896cfb9e2b5709039111b82079c3e8b8cfe65 GIT binary patch literal 212 zcmZ?q402{*U|<4b#$@K$P6hT8VlbMKfq|9zQ&s~5L*o*l^jDx75g=9&^I~5w`r=>o zgQF*t?(X3JbE^La3j<49W=<+l76?LuTwQ?_8-uQ)f&o{MYbeNuFtEI#fq|Kc2?HwS zBj&EydGWT%>GYjbEQ^Ae6!X+>Vza|)jX`lY?=6d)DXX6yvPfh8X)r65;Zo7s#M))= R7QK?vbbWOFMuGNp2LK+~MxOux literal 0 HcmV?d00001 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchRebase/expected/repo/.git_keep/info/exclude rename to test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..be5fa6486 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,13 @@ +0000000000000000000000000000000000000000 0227353d56e56df9e9f94559f90b86ce7aa1ca5c CI 1661164934 +1000 commit (initial): one +0227353d56e56df9e9f94559f90b86ce7aa1ca5c d7149d98e6da25303f9a8cdff131da4b0723a412 CI 1661164934 +1000 commit: two +d7149d98e6da25303f9a8cdff131da4b0723a412 4c66ef64d685d244db41efda29deffb381c46c3d CI 1661164934 +1000 commit: three +4c66ef64d685d244db41efda29deffb381c46c3d b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 commit: original +b827df09781d0648f66cd9a01f0ec0ad5d412e10 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from original-branch to first-change-branch +b827df09781d0648f66cd9a01f0ec0ad5d412e10 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 commit: first change +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from first-change-branch to original-branch +b827df09781d0648f66cd9a01f0ec0ad5d412e10 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from original-branch to second-change-branch +b827df09781d0648f66cd9a01f0ec0ad5d412e10 702b646c08ba47b2ac5729deed77188ef1647b4d CI 1661164934 +1000 commit: second change +702b646c08ba47b2ac5729deed77188ef1647b4d 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164934 +1000 commit: second-change-branch unrelated change +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 checkout: moving from second-change-branch to first-change-branch +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164936 +1000 rebase (start): checkout second-change-branch +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164938 +1000 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch new file mode 100644 index 000000000..994f744ef --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 branch: Created from HEAD +b827df09781d0648f66cd9a01f0ec0ad5d412e10 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 commit: first change +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164938 +1000 rebase (continue) (finish): refs/heads/first-change-branch onto 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch new file mode 100644 index 000000000..0de43eaeb --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 0227353d56e56df9e9f94559f90b86ce7aa1ca5c CI 1661164934 +1000 commit (initial): one +0227353d56e56df9e9f94559f90b86ce7aa1ca5c d7149d98e6da25303f9a8cdff131da4b0723a412 CI 1661164934 +1000 commit: two +d7149d98e6da25303f9a8cdff131da4b0723a412 4c66ef64d685d244db41efda29deffb381c46c3d CI 1661164934 +1000 commit: three +4c66ef64d685d244db41efda29deffb381c46c3d b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 commit: original diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch new file mode 100644 index 000000000..b20bc5041 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 branch: Created from HEAD +b827df09781d0648f66cd9a01f0ec0ad5d412e10 702b646c08ba47b2ac5729deed77188ef1647b4d CI 1661164934 +1000 commit: second change +702b646c08ba47b2ac5729deed77188ef1647b4d 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164934 +1000 commit: second-change-branch unrelated change diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 new file mode 100644 index 0000000000000000000000000000000000000000..bd9b135ac92b2dd8c84e8ee930f3abbad446dcdc GIT binary patch literal 49 zcmb_?tZyx1W^!I;T0!)zPP`GRvIt8v}0& E0IOXS3jhEB literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 new file mode 100644 index 0000000000000000000000000000000000000000..3f0746de578045d05bc0ab70eedb0910b69841be GIT binary patch literal 46 zcmV+}0MY+=0ZYosPf{>8V&DqN$SmgaEC$l4T*0Zy`FSY{&KZe$>8V_9nK`Lk0P)uh E7zjcZDF6Tf literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 new file mode 100644 index 0000000000000000000000000000000000000000..8cded6c81b47e88b26c954bb22ad356788258752 GIT binary patch literal 49 zcmb8WZ(+P$SmgaEC$l4TyB{~#U%>P8Hsu6AWlvy7Xam63&W%1 B5^Dee literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 0000000000000000000000000000000000000000..adf64119a33d7621aeeaa505d30adb58afaa5559 GIT binary patch literal 15 Wcmb4XW$CS$SmgaEC$l4T>eFw>6v+nIb3d;IjLL#xmpU3me3P0 literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d new file mode 100644 index 0000000000000000000000000000000000000000..b78879b105579bddbbb0f5a433b0ee5297e903f6 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@MfQTsB-1eiB0^U^#w3|g!P-(Hczk;Vx1YawWnGqM z_bB1icQa2pg`pOvP%>K<1qK@^w^Ug|N-dj_0J%+fdv{;2NKz#kR}Dji*hEvQtzpEf zl;Ikp5(cNAKCinUCx08KhkbR~UUn(#a`(uL$Rv^c83Di@^+0v|b9a3{=VPd9Re>JAhF+lC$6x%s zt?O%mbN)2CDj<@&La{Otic2-csv#B(B2%m+a%HrX%+6ig0756hhm29!lQ_;3xl~jO zk&RKS4F~&T_&w&W!{Z6J$Mdc~yzYyBo3?gPQrwowQnFsnI+pEem7$3YC_`0)tY6~(JZrB>@U zBzSunomm2?Ost|uN`yf5pMzoDKx-%_g&2}A&d-k`jKQcBEro*MioE?VDS+Yxs0146Sq EW|(wDi2wiq literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 new file mode 100644 index 0000000000000000000000000000000000000000..9fcee8fcd7e1571c6bf065db0ba746bb5a1e1c72 GIT binary patch literal 147 zcmV;E0Brww0gaA33IZ_@K&^9%^ny&XGh+rsgst`%`AkqSW?3S7eD?@8uXw!T<=)z3 zSSN58o2tbWJeADob7D;rfk6pV4TZ&rP?IVOpjqRluVKOa^F&i2R^n1cr3w=5gcLaI zIYyTwWfR}y-Zwih_A)Ow{l>OF^^|+NTF2}hqfBUz4gkz<_o<Gp0gcW}3c@fDfMM4;MfQTsLvlfn}hC)+Nl<02c=VeGGx7;=S5)leOz9nougF5U~KcSc$l#3|K)J za`DBX5d@V#ecqZLMtvQ|yL|JqzvRN(a??nJNG@5Y&j7Ke?*U_U@YJygo$z I0CvSYX@NRS+yDRo literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch new file mode 100644 index 000000000..4867226ea --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch @@ -0,0 +1 @@ +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch new file mode 100644 index 000000000..8b9bdc87a --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch @@ -0,0 +1 @@ +b827df09781d0648f66cd9a01f0ec0ad5d412e10 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch new file mode 100644 index 000000000..4867226ea --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch @@ -0,0 +1 @@ +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/file b/test/integration_new/branch/rebase/expected/repo/file new file mode 100644 index 000000000..164a07af1 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/file @@ -0,0 +1,6 @@ + +This +Is +The +Second Change +File diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..e2e92c427 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +to keep diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..e1c7bf8c5 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..27e5d1433 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +39129f24587bdc648e1fdb6f0b089c0846f54d45 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config new file mode 100644 index 000000000..8a748ce32 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config @@ -0,0 +1,12 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[commit] + gpgSign = false diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..44eb0c68b991165858fd0e4ca52e5785721eaa11 GIT binary patch literal 212 zcmZ?q402{*U|<4b#$@Ki5S}*EH!zx!fq|9zQ&AKHL*o*l^jDx75g=9&^I~5w`r=>o zgQF*t?(X3JbE^La3j<49W=<+l76?LuTwQ?_8-uQ)f&o{MYbeNuFtEI#fq|Kc2?HwS zBj&EydGWT%>GYjbEQ^Ae6!X+>Vza|)jX`lY?=6d)DXX6yvPfh8X)r5w`VK`CQ_e(_ RQ>-ssKEK>M^X)eo0RXP^MzjC` literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.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_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..a0a6f7fe5 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,16 @@ +0000000000000000000000000000000000000000 ab5816052b05d45683d9fd3aa85203995b66cd65 CI 1661165903 +1000 commit (initial): one +ab5816052b05d45683d9fd3aa85203995b66cd65 9d068e4adf5b237e3f3abe9ce38cfd996cce75dc CI 1661165903 +1000 commit: two +9d068e4adf5b237e3f3abe9ce38cfd996cce75dc 7c0af051757503c84800076fd34851ea8b81e415 CI 1661165903 +1000 commit: three +7c0af051757503c84800076fd34851ea8b81e415 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 commit: original +c066f8c513a34cd0c63e54c3b418a50491686cff c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from original-branch to first-change-branch +c066f8c513a34cd0c63e54c3b418a50491686cff 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 commit: first change +5587edfe46cfc076fb9ff4db76d196965838669a c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from first-change-branch to original-branch +c066f8c513a34cd0c63e54c3b418a50491686cff c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from original-branch to second-change-branch +c066f8c513a34cd0c63e54c3b418a50491686cff 3fc37a0e51435e01769aa25e6fe7179add2642a6 CI 1661165904 +1000 commit: second change +3fc37a0e51435e01769aa25e6fe7179add2642a6 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165904 +1000 commit: second-change-branch unrelated change +3228c73cfc742264f3101966a81d6a0a70488e36 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 checkout: moving from second-change-branch to first-change-branch +5587edfe46cfc076fb9ff4db76d196965838669a b56a14235fe8b10e5cca38d8b8009899d60b6499 CI 1661165904 +1000 commit: to drop +b56a14235fe8b10e5cca38d8b8009899d60b6499 39129f24587bdc648e1fdb6f0b089c0846f54d45 CI 1661165904 +1000 commit: to keep +39129f24587bdc648e1fdb6f0b089c0846f54d45 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165905 +1000 rebase (start): checkout second-change-branch +3228c73cfc742264f3101966a81d6a0a70488e36 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (pick): to keep +99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch new file mode 100644 index 000000000..46db32f0e --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 branch: Created from HEAD +c066f8c513a34cd0c63e54c3b418a50491686cff 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 commit: first change +5587edfe46cfc076fb9ff4db76d196965838669a b56a14235fe8b10e5cca38d8b8009899d60b6499 CI 1661165904 +1000 commit: to drop +b56a14235fe8b10e5cca38d8b8009899d60b6499 39129f24587bdc648e1fdb6f0b089c0846f54d45 CI 1661165904 +1000 commit: to keep +39129f24587bdc648e1fdb6f0b089c0846f54d45 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (finish): refs/heads/first-change-branch onto 3228c73cfc742264f3101966a81d6a0a70488e36 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch new file mode 100644 index 000000000..5999618a9 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 ab5816052b05d45683d9fd3aa85203995b66cd65 CI 1661165903 +1000 commit (initial): one +ab5816052b05d45683d9fd3aa85203995b66cd65 9d068e4adf5b237e3f3abe9ce38cfd996cce75dc CI 1661165903 +1000 commit: two +9d068e4adf5b237e3f3abe9ce38cfd996cce75dc 7c0af051757503c84800076fd34851ea8b81e415 CI 1661165903 +1000 commit: three +7c0af051757503c84800076fd34851ea8b81e415 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 commit: original diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch new file mode 100644 index 000000000..e0b0742a8 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 branch: Created from HEAD +c066f8c513a34cd0c63e54c3b418a50491686cff 3fc37a0e51435e01769aa25e6fe7179add2642a6 CI 1661165904 +1000 commit: second change +3fc37a0e51435e01769aa25e6fe7179add2642a6 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165904 +1000 commit: second-change-branch unrelated change diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 new file mode 100644 index 0000000000000000000000000000000000000000..bd9b135ac92b2dd8c84e8ee930f3abbad446dcdc GIT binary patch literal 49 zcmb_?tZyx1W^!I;T0!)zPP`GRvIt8v}0& E0IOXS3jhEB literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 new file mode 100644 index 0000000000000000000000000000000000000000..3f0746de578045d05bc0ab70eedb0910b69841be GIT binary patch literal 46 zcmV+}0MY+=0ZYosPf{>8V&DqN$SmgaEC$l4T*0Zy`FSY{&KZe$>8V_9nK`Lk0P)uh E7zjcZDF6Tf literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 new file mode 100644 index 0000000000000000000000000000000000000000..8cded6c81b47e88b26c954bb22ad356788258752 GIT binary patch literal 49 zcmb4Z8i;v2%h?kO|r3qO-qd6^DX!RuQPL)xGu}1 zfic6ORS`gRVv-v(JBPve?8huLCZrJTm|X}xqjp|xT%|PVbL<_XSUvPsc0-=oSfMO# z&p0JRgJDwqZu45E;HVK%?R1}N@@KAI64#QtICHs6 V7b=%H!@E>@a+3r8WZ(+P$SmgaEC$l4TyB{~#U%>P8Hsu6AWlvy7Xam63&W%1 B5^Dee literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 new file mode 100644 index 0000000000000000000000000000000000000000..91a3f59305cb4fec0824d5d4afbef89b41f1630f GIT binary patch literal 154 zcmV;L0A>Gp0gcW<3c@fDKvCB@MfQTsG|40Z5uvLdBbiLBV4G4Sczk;Vx1YE8+?M6p z^#E|{yNCwxG87+b@*eUKYYbH=6rh}4s6J4XW$CS$SmgaEC$l4T>eFw>6v+nIb3d;IjLL#xmpU3me3P0 literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a new file mode 100644 index 000000000..b4c454a68 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a @@ -0,0 +1,2 @@ +xK +0@] 2I ]tb!Fn}]bZT-f. H#r2;чiVms8H L0$-I]i=^z}YdFd3iMUS7YmeICa;: \ No newline at end of file diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc new file mode 100644 index 0000000000000000000000000000000000000000..125e024fab9dc20ad4b148addfcb48a014ce8fda GIT binary patch literal 85 zcmV-b0IL6Z0ZYosPg1ZnXW$CS$SmgaEC$l4Ts9D(;Nj}%!WEpFoS&DX;GB_|m!8UH r3jthinMK7VFhM&AP%t&MFi%ZMQ_x5Q%O-=hXad#dq;dfO7{nek|7|9q literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 new file mode 100644 index 0000000000000000000000000000000000000000..4b6d35f7f04de784048a4a7d1a464ac90e09f1f8 GIT binary patch literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)*$XoHO*2qL=&Hv^CKDqJ54w6h?13qhv~eAi?Jv3zChoW)V-|)saqlcTEK_ich76Y~3WTx|D@jT;y7a zkXfb?RO!>V{nX2<=Vg7!H?`v>H{RP_8$@F;5IB7`0H6jPQ(gYlRo}+C`T-MdI}hc- BLnit9kfT}Crmt?jb5husS~xgIp?U<2L`iU_ z1c@Pts3()&{nj=+PWC)bSN)`Aed?*SCHY=SMvpI G&pA=4j7m@d literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc new file mode 100644 index 0000000000000000000000000000000000000000..1e6785cfe1fcb7890e27f7088bf73579ccb823b4 GIT binary patch literal 146 zcmV;D0B!$x0gcX03c@fDKw;N8MfQSBerCvk6rrmgBa=)~Fs77<9^W3p?c-a#(p!5B z>ljXBSG7@+$66@*BBa6@2o$5NsS^8?R#A-%(QJ9w*RWYIIRf+oSR+yjmDd__PUs;p zqY#x!X!3j9`)=pOUgzbe-`uvRUP^D1bwth)G6Z{e0AP-KObz{$oAK%92hyuJjWU=; Ai~s-t literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 new file mode 100644 index 0000000000000000000000000000000000000000..00050c536340577500754ddf7c70a70f7f15d348 GIT binary patch literal 117 zcmV-*0E+*30gcT;3c@fDMq$@E#q0%{iIX7#5uvLdBT4_FV2qRq9^W3p?c;-2duxwD zqW&;8fV4y(mTKy2F_e_q7(vS#7fU|IwE&t}UH*)F-)NfYGR-%9b9+B=s=ZxF%tS0C XKGRW{+3j_o4E)Jmf5H6#f0ip&BqcW9 literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 new file mode 100644 index 0000000000000000000000000000000000000000..11da58d508b854e3f76fefb8c9b78a82cc71636c GIT binary patch literal 149 zcmV;G0BZku0gcX03c@fDKw;N8MfQTsG|8j`B0^U^Mt){cu%?6v9^W3p?Z;cZ(zfk6 zEV4h1E@Dxgo0NRX;0h3<^NdL+DAhy6Fvm!_hG6#8CXq6H#pW>sHvq>4;T zVRkbSCzC$o(Yjq$dtKJMeABkSTkDZbq}Ux83{za%?%K DRE9_t literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff new file mode 100644 index 0000000000000000000000000000000000000000..750122d3f3fb61a249aaabf5e223b3af4e52cdbd GIT binary patch literal 151 zcmV;I0BHYs0gaA93d0}}MZ5MC?h9omanylQ3R&eCY9?(U#vm4Y{Cb4$K9Bd{r;_v5 zG%{UU714;WSb@mKCSEvlBrzrpeS6D;@IYy_KB+TQIhu9}!U}|r9Ko2p@c`iLx{SsX zO7PL67$g-w?Om##W__RLr+h;`ce$mK9~!Miw8UWa6??8a?WdajsjE`A*LH+m{Qz%E FIiiIdNQeLc literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch new file mode 100644 index 000000000..c61dc9511 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch @@ -0,0 +1 @@ +99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch new file mode 100644 index 000000000..383cec079 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch @@ -0,0 +1 @@ +c066f8c513a34cd0c63e54c3b418a50491686cff diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch new file mode 100644 index 000000000..de415434a --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch @@ -0,0 +1 @@ +3228c73cfc742264f3101966a81d6a0a70488e36 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/file b/test/integration_new/branch/rebase_and_drop/expected/repo/file new file mode 100644 index 000000000..164a07af1 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/file @@ -0,0 +1,6 @@ + +This +Is +The +Second Change +File