From d80d1f8493e68edbc9acc2ce187f24a0f3be13a1 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Apr 2021 12:33:29 +1000 Subject: [PATCH] more tests --- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../branchSuggestions/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 137 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 8 + .../expected/.git_keep/logs/refs/heads/master | 1 + .../.git_keep/logs/refs/heads/new-branch | 1 + .../.git_keep/logs/refs/heads/new-branch-2 | 1 + .../.git_keep/logs/refs/heads/new-branch-3 | 1 + .../.git_keep/logs/refs/heads/old-branch | 1 + .../.git_keep/logs/refs/heads/old-branch-2 | 1 + .../.git_keep/logs/refs/heads/old-branch-3 | 1 + .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 | 2 + .../expected/.git_keep/refs/heads/master | 1 + .../expected/.git_keep/refs/heads/new-branch | 1 + .../.git_keep/refs/heads/new-branch-2 | 1 + .../.git_keep/refs/heads/new-branch-3 | 1 + .../expected/.git_keep/refs/heads/old-branch | 1 + .../.git_keep/refs/heads/old-branch-2 | 1 + .../.git_keep/refs/heads/old-branch-3 | 1 + .../branchSuggestions/expected/file0 | 1 + .../branchSuggestions/recording.json | 1 + test/integration/branchSuggestions/setup.sh | 19 +++ test/integration/branchSuggestions/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 15 ++ .../expected/.git_keep/FETCH_HEAD | 0 .../cherryPicking/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/REBASE_HEAD | 1 + .../cherryPicking/expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../cherryPicking/expected/.git_keep/index | Bin 0 -> 1356 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 40 +++++ .../.git_keep/logs/refs/heads/base_branch | 3 + .../.git_keep/logs/refs/heads/develop | 5 + .../logs/refs/heads/feature/cherry-picking | 9 + .../expected/.git_keep/logs/refs/heads/master | 5 + .../.git_keep/logs/refs/heads/other_branch | 3 + .../05/56e5da1cda4e150d6cc1182be6efdb061f59fe | Bin 0 -> 158 bytes .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 0 -> 112 bytes .../16/f2bcca6ce7bcc17277103a5555072a6c3322a2 | 4 + .../17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 | Bin 0 -> 34 bytes .../17/4a8c9444cfa700682d74059d9fa9be5749242c | Bin 0 -> 177 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 | Bin 0 -> 66 bytes .../19/079c78db18112c5a2720896a040014a2d05f6d | Bin 0 -> 153 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 0 -> 50 bytes .../20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 | Bin 0 -> 144 bytes .../21/28c3c3def18d6e2a389957252fdb69ba85fce0 | Bin 0 -> 208 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 0 -> 117 bytes .../22/b0fd807dd5e428c2d818aef6a2311d7c11e885 | Bin 0 -> 66 bytes .../23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d | 2 + .../24/6f7487e08e6330ccbec4053e701145d53f64d4 | Bin 0 -> 327 bytes .../24/93c87610e0a9b8edfca592cb01a027f60ce587 | 3 + .../2c/f63d6da8c52131dd79622f8572b44a1267e420 | Bin 0 -> 121 bytes .../2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 | Bin 0 -> 150 bytes .../33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 | 2 + .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 0 -> 120 bytes .../36/e0ef3e52c6e29e64980c71defbab6064d2da8c | Bin 0 -> 252 bytes .../3e/0d4389ab458a8643281e494e3ebae7ce307eec | 1 + .../45/20f99d650662a3f597a200fea5f2599f528180 | 3 + .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 + .../5d/2484f3cb6ce658e296526c48e1a376b2790dfc | Bin 0 -> 147 bytes .../5d/a4d9200457542d875fe4def54ac98c16332db0 | Bin 0 -> 33 bytes .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 0 -> 86 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 0 -> 54 bytes .../61/01e935461d4cd862ae4a720846e87880d198b9 | Bin 0 -> 66 bytes .../65/c0438e428cd1aa94588eaa52eb7ebad7ec62fd | Bin 0 -> 168 bytes .../68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f | 2 + .../69/6a8fd43c580b3bed203977faab4566b052a4e4 | Bin 0 -> 156 bytes .../6b/6092c6840d05583489cc32a1260db0d5390a98 | Bin 0 -> 233 bytes .../73/17cf7580efd92f974c8dfb3cde84eded8dafec | 2 + .../78/3666de4acbb22a9efc205197667f5136118c54 | Bin 0 -> 328 bytes .../78/a5ec82970200538b70f5ac61c18acb45ccb8ee | 2 + .../79/23e4a952f4b169373b0389be6a9db3cd929547 | 3 + .../88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d | Bin 0 -> 66 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 0 -> 65 bytes .../90/a84fd62f8033027fab3e567a81d5ed2a6a71cd | Bin 0 -> 66 bytes .../95/9d7a10da71acf97b17300b40a3b4f30903e09c | Bin 0 -> 358 bytes .../9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 | Bin 0 -> 154 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 0 -> 54 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../af/a76754c933269d7cd45630a7184a20849dbe9c | Bin 0 -> 66 bytes .../b4/121e2d6aa156227b6541431ddfb8594904b520 | Bin 0 -> 66 bytes .../b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 | Bin 0 -> 162 bytes .../bd/6f34089ba29cbae102003bd973e9f37a235c2e | Bin 0 -> 254 bytes .../bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 | 2 + .../c1/dd146476a4a37fff75b88612a718281ea83b58 | Bin 0 -> 277 bytes .../ce/ecbe69460104e09eb2cd7c865df520c5679a68 | Bin 0 -> 183 bytes .../d0/60f7226715ca55b04e91fad2b8aca01badd993 | Bin 0 -> 303 bytes .../d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 | Bin 0 -> 201 bytes .../d8/e5ca46d2bbd7c115e5849e637efe2361203368 | 2 + .../da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 | Bin 0 -> 227 bytes .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 0 -> 50 bytes .../e4/48ae5bf6371d80ebee24a22b6df341797a6511 | Bin 0 -> 66 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 0 -> 86 bytes .../e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc | 2 + .../ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d | Bin 0 -> 361 bytes .../eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 | Bin 0 -> 66 bytes .../ef/029771f117b5f31c972dfa546037662e243ca7 | Bin 0 -> 162 bytes .../f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 | Bin 0 -> 144 bytes .../f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 | 2 + .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 0 -> 54 bytes .../f4/ffac820a371104fe611d81bc13a45b70a3ebb3 | Bin 0 -> 158 bytes .../fa/cb56c48e4718f71c08116153c93d87bc699671 | 2 + .../fd/31cea7e0b6e8d334280be34db8dd86cdda3007 | Bin 0 -> 352 bytes .../expected/.git_keep/refs/heads/base_branch | 1 + .../expected/.git_keep/refs/heads/develop | 1 + .../refs/heads/feature/cherry-picking | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/heads/other_branch | 1 + .../cherryPicking/expected/cherrypicking3 | 1 + .../cherryPicking/expected/cherrypicking4 | 1 + .../cherryPicking/expected/cherrypicking5 | 1 + .../cherryPicking/expected/directory/file | 1 + .../cherryPicking/expected/directory/file2 | 1 + test/integration/cherryPicking/expected/file | 1 + test/integration/cherryPicking/expected/file1 | 63 +++++++ test/integration/cherryPicking/expected/file3 | 1 + test/integration/cherryPicking/expected/file4 | 1 + test/integration/cherryPicking/expected/file5 | 1 + test/integration/cherryPicking/recording.json | 1 + test/integration/cherryPicking/setup.sh | 155 ++++++++++++++++++ test/integration/cherryPicking/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../commitsNewBranch/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../commitsNewBranch/expected/.git_keep/index | Bin 0 -> 209 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 4 + .../expected/.git_keep/logs/refs/heads/lol | 1 + .../expected/.git_keep/logs/refs/heads/master | 3 + .../00/29f9bf66e346d47ede6a501abb5b82bee60096 | Bin 0 -> 148 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../99/01fd9b7766be600bed07f55f1794a759527a98 | Bin 0 -> 118 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e1/cb250774fb8606d33062518d0ae03831130249 | Bin 0 -> 148 bytes .../expected/.git_keep/refs/heads/lol | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../commitsNewBranch/expected/file0 | 1 + .../commitsNewBranch/expected/file1 | 1 + .../commitsNewBranch/recording.json | 1 + test/integration/commitsNewBranch/setup.sh | 20 +++ test/integration/commitsNewBranch/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../commitsRevert/expected/.git_keep/HEAD | 1 + .../commitsRevert/expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../commitsRevert/expected/.git_keep/index | Bin 0 -> 209 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 4 + .../expected/.git_keep/logs/refs/heads/master | 3 + .../.git_keep/logs/refs/heads/newbranch | 1 + .../08/42967ae6f16d85995f718922256cea03d10b4e | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3e/9204493881a93d230aa85233c4721b6e83268d | 3 + .../59/2b94b2f4dc9b7831efbd76f711f6232448730e | 2 + .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../expected/.git_keep/refs/heads/master | 1 + .../expected/.git_keep/refs/heads/newbranch | 1 + test/integration/commitsRevert/expected/file0 | 1 + test/integration/commitsRevert/expected/file1 | 1 + test/integration/commitsRevert/recording.json | 1 + test/integration/commitsRevert/setup.sh | 20 +++ test/integration/commitsRevert/test.json | 1 + .../rebase/expected/.git_keep/COMMIT_EDITMSG | 30 ++++ .../rebase/expected/.git_keep/FETCH_HEAD | 0 .../rebase/expected/.git_keep/HEAD | 1 + .../rebase/expected/.git_keep/ORIG_HEAD | 1 + .../rebase/expected/.git_keep/config | 10 ++ .../rebase/expected/.git_keep/description | 1 + .../rebase/expected/.git_keep/index | Bin 0 -> 353 bytes .../rebase/expected/.git_keep/info/exclude | 7 + .../rebase/expected/.git_keep/logs/HEAD | 9 + .../expected/.git_keep/logs/refs/heads/master | 5 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../18/24d7294d6d3524d83510db27086177a6db97bf | Bin 0 -> 155 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../47/614f63053804bc596291b8f7cff3b460b1b3ee | Bin 0 -> 148 bytes .../57/8ebf1736e797b78fb670c718ebf177936eb2ef | Bin 0 -> 146 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e8/ece6af94d443b67962124243509d8f61a29758 | 3 + .../ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c | Bin 0 -> 119 bytes .../fa/af373a925c1e335894ebf4343a00a917f04edc | Bin 0 -> 147 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/rebase/expected/file0 | 1 + test/integration/rebase/expected/file1 | 1 + test/integration/rebase/expected/file2 | 1 + test/integration/rebase/expected/file4 | 1 + test/integration/rebase/recording.json | 1 + test/integration/rebase/setup.sh | 24 +++ test/integration/rebase/test.json | 1 + .../rebase2/expected/.git_keep/COMMIT_EDITMSG | 16 ++ .../rebase2/expected/.git_keep/FETCH_HEAD | 0 .../rebase2/expected/.git_keep/HEAD | 1 + .../rebase2/expected/.git_keep/MERGE_MSG | 4 + .../rebase2/expected/.git_keep/ORIG_HEAD | 1 + .../rebase2/expected/.git_keep/REBASE_HEAD | 1 + .../rebase2/expected/.git_keep/config | 10 ++ .../rebase2/expected/.git_keep/description | 1 + .../rebase2/expected/.git_keep/index | Bin 0 -> 429 bytes .../rebase2/expected/.git_keep/info/exclude | 7 + .../rebase2/expected/.git_keep/logs/HEAD | 10 ++ .../expected/.git_keep/logs/refs/heads/master | 7 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../26/d430fb59900099e9992a3c79f30e42309cdce3 | 3 + .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf | Bin 0 -> 147 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../61/baf480bb5ddfad6d66c785b321d4aadd5367b4 | 2 + .../8d/3ce0d821345b25fef1188e48cba4a1d44c30be | Bin 0 -> 65 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../bb/c22338ee174004f5c5fa117688249bc5b7e205 | Bin 0 -> 71 bytes .../bc/e4745137c540943900ca78e4b31dd1315bf57c | Bin 0 -> 153 bytes .../c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 | Bin 0 -> 161 bytes .../c3/901284a9e7fc063d6fa7f0c5797d031445ba45 | Bin 0 -> 158 bytes .../cc/01bf15804065932f5e50340902614b3c04c948 | Bin 0 -> 127 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../f9/4292928d0bc034fe88c753306b1959300e1264 | 2 + .../ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/rebase2/expected/file0 | 1 + test/integration/rebase2/expected/file1 | 1 + test/integration/rebase2/expected/file2 | 1 + test/integration/rebase2/expected/file4 | 1 + test/integration/rebase2/recording.json | 1 + test/integration/rebase2/setup.sh | 32 ++++ test/integration/rebase2/test.json | 1 + .../rebase3/expected/.git_keep/COMMIT_EDITMSG | 27 +++ .../rebase3/expected/.git_keep/FETCH_HEAD | 0 .../rebase3/expected/.git_keep/HEAD | 1 + .../rebase3/expected/.git_keep/ORIG_HEAD | 1 + .../rebase3/expected/.git_keep/config | 10 ++ .../rebase3/expected/.git_keep/description | 1 + .../rebase3/expected/.git_keep/index | Bin 0 -> 353 bytes .../rebase3/expected/.git_keep/info/exclude | 7 + .../rebase3/expected/.git_keep/logs/HEAD | 12 ++ .../expected/.git_keep/logs/refs/heads/master | 7 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3c/21f03d819ae34b74084712c3ef1b9b99b2f40e | Bin 0 -> 154 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc | Bin 0 -> 154 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../51/a0e4a6635c22a062a48b7134dd556541a1e06c | Bin 0 -> 147 bytes .../7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 | Bin 0 -> 155 bytes .../8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 | Bin 0 -> 154 bytes .../9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 | Bin 0 -> 158 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../cc/01bf15804065932f5e50340902614b3c04c948 | Bin 0 -> 127 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 | Bin 0 -> 150 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac | 4 + .../fd/ecf9e3e742db4c8690d56b328b2533e67d2866 | Bin 0 -> 118 bytes .../ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/rebase3/expected/file0 | 1 + test/integration/rebase3/expected/file1 | 1 + test/integration/rebase3/expected/file2 | 1 + test/integration/rebase3/expected/file4 | 1 + test/integration/rebase3/recording.json | 1 + test/integration/rebase3/setup.sh | 32 ++++ test/integration/rebase3/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 24 +++ .../expected/.git_keep/FETCH_HEAD | 0 .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_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 | 14 ++ .../expected/.git_keep/logs/refs/heads/master | 8 + .../0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d | Bin 0 -> 118 bytes .../12/ed10a6439eadfdb8877e39b7c6547591a0a91c | Bin 0 -> 151 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1d/197a4c509a5e71bad9b0b439c8fd26323ff218 | Bin 0 -> 153 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../4a/e4346ad59bf70d5ba07184af5a138b6a65c224 | 3 + .../4d/c7f318f68fe1890dba6fb595009c4652c0a861 | Bin 0 -> 159 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../74/d431c56eac1e359f6f5736978347af68af5702 | 3 + .../76/79fc004a4a40da12907d72ccef14991976aaff | Bin 0 -> 164 bytes .../7b/01314ccdeccc57cee454feca6369237410e786 | Bin 0 -> 148 bytes .../8a/db7457de59c3945566ce7675a31bbf048b38ee | Bin 0 -> 165 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../cc/01bf15804065932f5e50340902614b3c04c948 | Bin 0 -> 127 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../db/ab7e62cd7517f73425d46120a931a59c8eda6e | Bin 0 -> 150 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/master | 1 + .../rebaseFixupAndSquash/expected/file0 | 1 + .../rebaseFixupAndSquash/expected/file1 | 1 + .../rebaseFixupAndSquash/expected/file2 | 1 + .../rebaseFixupAndSquash/expected/file4 | 1 + .../rebaseFixupAndSquash/recording.json | 1 + .../integration/rebaseFixupAndSquash/setup.sh | 32 ++++ .../rebaseFixupAndSquash/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../rebaseFixups/expected/.git_keep/HEAD | 1 + .../rebaseFixups/expected/.git_keep/ORIG_HEAD | 1 + .../rebaseFixups/expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../rebaseFixups/expected/.git_keep/index | Bin 0 -> 497 bytes .../expected/.git_keep/info/exclude | 7 + .../rebaseFixups/expected/.git_keep/logs/HEAD | 14 ++ .../expected/.git_keep/logs/refs/heads/master | 9 + .../10/56fd624d61daad06a8726c0ea5626820cafe59 | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1d/7ab21ab5322589052cf9d2d62ca58677f454cc | 3 + .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2a/627747a92ce8c274f7df0da3329616f69b9856 | Bin 0 -> 152 bytes .../2b/d4d58d29b60b5868c19437ff4467d84ed270aa | Bin 0 -> 156 bytes .../30/a685cfa43930aadd5b56b2ec0746564d1a1d22 | Bin 0 -> 154 bytes .../33/1be377b5889b19b5900bc4bed98b1c9cc40095 | Bin 0 -> 152 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../4d/7b35df7f8ced30495fc0f62b91a270bad7076b | Bin 0 -> 157 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../69/ebe8bf01f728a9bc787e8553694e36127b48c0 | Bin 0 -> 148 bytes .../77/741cf500de50347e9f4e5a091515e4568ddad3 | Bin 0 -> 158 bytes .../83/90c32b5e687b97e242da46498b574ace0e1eb5 | Bin 0 -> 21 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../ac/e527b9737b6c554963361f50ce98a0509c2344 | Bin 0 -> 153 bytes .../ad/46c1683d660e21b4f13ad808420a4de18326b7 | 2 + .../b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 | Bin 0 -> 119 bytes .../ba/860ef885ce294ade006af8afda01a8cc584a12 | 2 + .../c8/07dfd74adc1e1b732025cab46cf56b4d193e74 | Bin 0 -> 152 bytes .../c8/738908c85292494dba61be9c050ad95ff0e182 | Bin 0 -> 162 bytes .../cc/01bf15804065932f5e50340902614b3c04c948 | Bin 0 -> 127 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../d1/3e563982268d8ab77ad47793a2b501dfe6a0dc | Bin 0 -> 177 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../dc/bade3308277dabb66de476c1cce03bd840d22a | Bin 0 -> 159 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e3/ad04c1fd3c9137b052ecb422855052f044d88f | Bin 0 -> 21 bytes .../ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 | Bin 0 -> 127 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/rebaseFixups/expected/file0 | 1 + test/integration/rebaseFixups/expected/file1 | 1 + test/integration/rebaseFixups/expected/file2 | 1 + test/integration/rebaseFixups/expected/file4 | 1 + test/integration/rebaseFixups/expected/file5 | 1 + test/integration/rebaseFixups/expected/file6 | 1 + test/integration/rebaseFixups/recording.json | 1 + test/integration/rebaseFixups/setup.sh | 35 ++++ test/integration/rebaseFixups/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../rebaseReword/expected/.git_keep/HEAD | 1 + .../rebaseReword/expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../rebaseReword/expected/.git_keep/index | Bin 0 -> 281 bytes .../expected/.git_keep/info/exclude | 7 + .../rebaseReword/expected/.git_keep/logs/HEAD | 4 + .../expected/.git_keep/logs/refs/heads/master | 4 + .../13/82f9e49487698170ca3356542ed94aff522d18 | Bin 0 -> 148 bytes .../17/19c3b9865f00407fbee59ee004104edc8bb62e | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../4a/225f57a7e50ba304defb8db41d9736dd85613d | 3 + .../77/a46efac3df6a531125dd83031978f4207fb0bf | 3 + .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../expected/.git_keep/refs/heads/master | 1 + test/integration/rebaseReword/expected/file0 | 1 + test/integration/rebaseReword/expected/file1 | 1 + test/integration/rebaseReword/expected/file2 | 1 + test/integration/rebaseReword/recording.json | 1 + test/integration/rebaseReword/setup.sh | 20 +++ test/integration/rebaseReword/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 15 ++ .../expected/.git_keep/FETCH_HEAD | 0 .../rebaseSwapping/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/REBASE_HEAD | 1 + .../rebaseSwapping/expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../rebaseSwapping/expected/.git_keep/index | Bin 0 -> 448 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 10 ++ .../expected/.git_keep/logs/refs/heads/master | 7 + .../0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../41/eefd8a741d391640c4e0528e0b6fff31f90a18 | Bin 0 -> 157 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../5e/6e75233f7d0501f030400c0b55d4c778b72b73 | Bin 0 -> 65 bytes .../61/3c1bfa180babe5e67317d1ef42d566718a7d8f | Bin 0 -> 151 bytes .../84/c7a918e6bd704aaf4f789ecaea479ab31d4741 | Bin 0 -> 161 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 | Bin 0 -> 118 bytes .../b2/18d34eec545f29156411f24ab609b970082e1c | 4 + .../cc/01bf15804065932f5e50340902614b3c04c948 | Bin 0 -> 127 bytes .../ce/ada384bff8df54abb8acbf497b751aa9220f00 | Bin 0 -> 153 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../d2/3bcf26566cbf601e766d12ea206cb7827d6630 | Bin 0 -> 147 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 | Bin 0 -> 127 bytes .../ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f | Bin 0 -> 71 bytes .../expected/.git_keep/refs/heads/master | 1 + .../integration/rebaseSwapping/expected/file0 | 1 + .../integration/rebaseSwapping/expected/file1 | 1 + .../integration/rebaseSwapping/expected/file2 | 1 + .../integration/rebaseSwapping/expected/file4 | 1 + .../integration/rebaseSwapping/recording.json | 1 + test/integration/rebaseSwapping/setup.sh | 32 ++++ test/integration/rebaseSwapping/test.json | 1 + .../stash/expected/.git_keep/COMMIT_EDITMSG | 1 + .../stash/expected/.git_keep/FETCH_HEAD | 0 .../integration/stash/expected/.git_keep/HEAD | 1 + .../stash/expected/.git_keep/ORIG_HEAD | 1 + .../stash/expected/.git_keep/config | 10 ++ .../stash/expected/.git_keep/description | 1 + .../stash/expected/.git_keep/index | Bin 0 -> 281 bytes .../stash/expected/.git_keep/info/exclude | 7 + .../stash/expected/.git_keep/logs/HEAD | 6 + .../expected/.git_keep/logs/refs/heads/master | 3 + .../stash/expected/.git_keep/logs/refs/stash | 2 + .../05/f4edebb0aadc631926ea90f2f4f74033127a19 | Bin 0 -> 146 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 | 1 + .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../21/1d7ffb63edc061a144eb1e198d94768000c723 | Bin 0 -> 148 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../40/0778244da4711bc99a7b1a84bab99213601a4e | 2 + .../56/52247b638d1516506790d6648b864ba3447f68 | Bin 0 -> 127 bytes .../5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 | Bin 0 -> 164 bytes .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 0 -> 81 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 + .../7c/00a9fdad735ecd011f92c03295ee7e784ca1cc | Bin 0 -> 162 bytes .../85/d387b0ab853a34de01344e8ca614fe8ea58318 | 1 + .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../9f/2757166809c291c65f09778abb46cfcc4e4a0c | Bin 0 -> 107 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff | Bin 0 -> 118 bytes .../expected/.git_keep/refs/heads/master | 1 + .../stash/expected/.git_keep/refs/stash | 1 + test/integration/stash/expected/file0 | 1 + test/integration/stash/expected/file1 | 1 + test/integration/stash/expected/file2 | 1 + test/integration/stash/recording.json | 1 + test/integration/stash/setup.sh | 24 +++ test/integration/stash/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../stashFiles/expected/.git_keep/FETCH_HEAD | 0 .../stashFiles/expected/.git_keep/HEAD | 1 + .../stashFiles/expected/.git_keep/ORIG_HEAD | 1 + .../stashFiles/expected/.git_keep/config | 10 ++ .../stashFiles/expected/.git_keep/description | 1 + .../stashFiles/expected/.git_keep/index | Bin 0 -> 334 bytes .../expected/.git_keep/info/exclude | 7 + .../stashFiles/expected/.git_keep/logs/HEAD | 4 + .../expected/.git_keep/logs/refs/heads/master | 3 + .../expected/.git_keep/logs/refs/stash | 1 + .../14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 | Bin 0 -> 148 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../28/59c9a5f343c80929844d6e49d3792b9169c4da | Bin 0 -> 85 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../5e/1c4f2926fa291fbd2f95095429c75bc1148693 | Bin 0 -> 118 bytes .../6c/a18002905d50a6a77808f8b7d50839f68da7b7 | 1 + .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac | Bin 0 -> 161 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 | 3 + .../expected/.git_keep/refs/heads/master | 1 + .../stashFiles/expected/.git_keep/refs/stash | 1 + test/integration/stashFiles/expected/file0 | 1 + test/integration/stashFiles/expected/file1 | 1 + test/integration/stashFiles/expected/file2 | 1 + test/integration/stashFiles/expected/file3 | 1 + test/integration/stashFiles/recording.json | 1 + test/integration/stashFiles/setup.sh | 24 +++ test/integration/stashFiles/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../stashNewBranch/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../stashNewBranch/expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../stashNewBranch/expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 5 + .../expected/.git_keep/logs/refs/heads/hello | 1 + .../expected/.git_keep/logs/refs/heads/master | 3 + .../expected/.git_keep/logs/refs/stash | 1 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../28/59c9a5f343c80929844d6e49d3792b9169c4da | Bin 0 -> 85 bytes .../2a/b31642272ef6607700326d4ddb78f35e609d2b | Bin 0 -> 147 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 | Bin 0 -> 147 bytes .../71/890c9b458697fbb4a6a9dde41614bea569aac8 | 2 + .../79/7c030ec107d77fa39a1e453ad620235cb26725 | Bin 0 -> 118 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 | Bin 0 -> 162 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../expected/.git_keep/refs/heads/hello | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../expected/.git_keep/refs/stash | 1 + .../integration/stashNewBranch/expected/file0 | 1 + .../integration/stashNewBranch/expected/file1 | 1 + .../integration/stashNewBranch/expected/file2 | 1 + .../integration/stashNewBranch/expected/file3 | 1 + .../integration/stashNewBranch/recording.json | 1 + test/integration/stashNewBranch/setup.sh | 24 +++ test/integration/stashNewBranch/test.json | 1 + test/integration/tags/test.json | 2 +- .../tags2/expected/.git_keep/COMMIT_EDITMSG | 1 + .../tags2/expected/.git_keep/FETCH_HEAD | 0 .../integration/tags2/expected/.git_keep/HEAD | 1 + .../tags2/expected/.git_keep/ORIG_HEAD | 1 + .../tags2/expected/.git_keep/config | 10 ++ .../tags2/expected/.git_keep/description | 1 + .../tags2/expected/.git_keep/index | Bin 0 -> 281 bytes .../tags2/expected/.git_keep/info/exclude | 7 + .../tags2/expected/.git_keep/logs/HEAD | 6 + .../expected/.git_keep/logs/refs/heads/master | 4 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../6e/cb690d237f4196cb3ec881669c7e9e348939c0 | Bin 0 -> 147 bytes .../75/6089d39d55db6e11af06cb9c95f6d81f5d47ae | Bin 0 -> 118 bytes .../7d/431518930a9fd2d08a09705645fe45d8507860 | Bin 0 -> 147 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../dc/46c2541c98c11cce0ec0a67f7d95f81686b1e4 | 4 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + .../tags2/expected/.git_keep/refs/tags/one | 1 + .../tags2/expected/.git_keep/refs/tags/two | 1 + test/integration/tags2/expected/file0 | 1 + test/integration/tags2/expected/file1 | 1 + test/integration/tags2/expected/file2 | 1 + test/integration/tags2/recording.json | 1 + test/integration/tags2/setup.sh | 24 +++ test/integration/tags2/test.json | 1 + .../tags3/expected/.git_keep/COMMIT_EDITMSG | 1 + .../tags3/expected/.git_keep/FETCH_HEAD | 0 .../integration/tags3/expected/.git_keep/HEAD | 1 + .../tags3/expected/.git_keep/config | 10 ++ .../tags3/expected/.git_keep/description | 1 + .../tags3/expected/.git_keep/index | Bin 0 -> 209 bytes .../tags3/expected/.git_keep/info/exclude | 7 + .../tags3/expected/.git_keep/logs/HEAD | 5 + .../expected/.git_keep/logs/refs/heads/master | 4 + .../expected/.git_keep/logs/refs/heads/test | 1 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../29/ff87a318d242acab116d17e421480b5d8002cd | Bin 0 -> 148 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 0 -> 127 bytes .../54/bd2b22db1e849928a333ebfe8f3fba1159adde | 2 + .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../b8/1aa63f3545be4f565c8a64a943517c8da94a6e | Bin 0 -> 147 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../ec/f6d101974303948e79d673ccff18c592f89650 | 2 + .../expected/.git_keep/refs/heads/master | 1 + .../tags3/expected/.git_keep/refs/heads/test | 1 + .../tags3/expected/.git_keep/refs/tags/one | 1 + test/integration/tags3/expected/file0 | 1 + test/integration/tags3/expected/file1 | 1 + test/integration/tags3/recording.json | 1 + test/integration/tags3/setup.sh | 24 +++ test/integration/tags3/test.json | 1 + 622 files changed, 1593 insertions(+), 1 deletion(-) create mode 100644 test/integration/branchSuggestions/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/branchSuggestions/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/branchSuggestions/expected/.git_keep/HEAD create mode 100644 test/integration/branchSuggestions/expected/.git_keep/config create mode 100644 test/integration/branchSuggestions/expected/.git_keep/description create mode 100644 test/integration/branchSuggestions/expected/.git_keep/index create mode 100644 test/integration/branchSuggestions/expected/.git_keep/info/exclude create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/HEAD create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-2 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-3 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-2 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-3 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/branchSuggestions/expected/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/refs/heads/master create mode 100644 test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch create mode 100644 test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-2 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-3 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch create mode 100644 test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-2 create mode 100644 test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-3 create mode 100644 test/integration/branchSuggestions/expected/file0 create mode 100644 test/integration/branchSuggestions/recording.json create mode 100644 test/integration/branchSuggestions/setup.sh create mode 100644 test/integration/branchSuggestions/test.json create mode 100644 test/integration/cherryPicking/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/cherryPicking/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/cherryPicking/expected/.git_keep/HEAD create mode 100644 test/integration/cherryPicking/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/cherryPicking/expected/.git_keep/REBASE_HEAD create mode 100644 test/integration/cherryPicking/expected/.git_keep/config create mode 100644 test/integration/cherryPicking/expected/.git_keep/description create mode 100644 test/integration/cherryPicking/expected/.git_keep/index create mode 100644 test/integration/cherryPicking/expected/.git_keep/info/exclude create mode 100644 test/integration/cherryPicking/expected/.git_keep/logs/HEAD create mode 100644 test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/base_branch create mode 100644 test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/develop create mode 100644 test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/feature/cherry-picking create mode 100644 test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/other_branch create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/5d/2484f3cb6ce658e296526c48e1a376b2790dfc create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/65/c0438e428cd1aa94588eaa52eb7ebad7ec62fd create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/f4/ffac820a371104fe611d81bc13a45b70a3ebb3 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 create mode 100644 test/integration/cherryPicking/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 create mode 100644 test/integration/cherryPicking/expected/.git_keep/refs/heads/base_branch create mode 100644 test/integration/cherryPicking/expected/.git_keep/refs/heads/develop create mode 100644 test/integration/cherryPicking/expected/.git_keep/refs/heads/feature/cherry-picking create mode 100644 test/integration/cherryPicking/expected/.git_keep/refs/heads/master create mode 100644 test/integration/cherryPicking/expected/.git_keep/refs/heads/other_branch create mode 100644 test/integration/cherryPicking/expected/cherrypicking3 create mode 100644 test/integration/cherryPicking/expected/cherrypicking4 create mode 100644 test/integration/cherryPicking/expected/cherrypicking5 create mode 100644 test/integration/cherryPicking/expected/directory/file create mode 100644 test/integration/cherryPicking/expected/directory/file2 create mode 100644 test/integration/cherryPicking/expected/file create mode 100644 test/integration/cherryPicking/expected/file1 create mode 100644 test/integration/cherryPicking/expected/file3 create mode 100644 test/integration/cherryPicking/expected/file4 create mode 100644 test/integration/cherryPicking/expected/file5 create mode 100644 test/integration/cherryPicking/recording.json create mode 100644 test/integration/cherryPicking/setup.sh create mode 100644 test/integration/cherryPicking/test.json create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/HEAD create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/config create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/description create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/index create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/info/exclude create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/logs/HEAD create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/lol create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/00/29f9bf66e346d47ede6a501abb5b82bee60096 create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/99/01fd9b7766be600bed07f55f1794a759527a98 create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/objects/e1/cb250774fb8606d33062518d0ae03831130249 create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/refs/heads/lol create mode 100644 test/integration/commitsNewBranch/expected/.git_keep/refs/heads/master create mode 100644 test/integration/commitsNewBranch/expected/file0 create mode 100644 test/integration/commitsNewBranch/expected/file1 create mode 100644 test/integration/commitsNewBranch/recording.json create mode 100644 test/integration/commitsNewBranch/setup.sh create mode 100644 test/integration/commitsNewBranch/test.json create mode 100644 test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/commitsRevert/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/commitsRevert/expected/.git_keep/HEAD create mode 100644 test/integration/commitsRevert/expected/.git_keep/config create mode 100644 test/integration/commitsRevert/expected/.git_keep/description create mode 100644 test/integration/commitsRevert/expected/.git_keep/index create mode 100644 test/integration/commitsRevert/expected/.git_keep/info/exclude create mode 100644 test/integration/commitsRevert/expected/.git_keep/logs/HEAD create mode 100644 test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/3e/9204493881a93d230aa85233c4721b6e83268d create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/59/2b94b2f4dc9b7831efbd76f711f6232448730e create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/commitsRevert/expected/.git_keep/refs/heads/master create mode 100644 test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch create mode 100644 test/integration/commitsRevert/expected/file0 create mode 100644 test/integration/commitsRevert/expected/file1 create mode 100644 test/integration/commitsRevert/recording.json create mode 100644 test/integration/commitsRevert/setup.sh create mode 100644 test/integration/commitsRevert/test.json create mode 100644 test/integration/rebase/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebase/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebase/expected/.git_keep/HEAD create mode 100644 test/integration/rebase/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/rebase/expected/.git_keep/config create mode 100644 test/integration/rebase/expected/.git_keep/description create mode 100644 test/integration/rebase/expected/.git_keep/index create mode 100644 test/integration/rebase/expected/.git_keep/info/exclude create mode 100644 test/integration/rebase/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebase/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebase/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebase/expected/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf create mode 100644 test/integration/rebase/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebase/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebase/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/rebase/expected/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee create mode 100644 test/integration/rebase/expected/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef create mode 100644 test/integration/rebase/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebase/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/rebase/expected/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 create mode 100644 test/integration/rebase/expected/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c create mode 100644 test/integration/rebase/expected/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc create mode 100644 test/integration/rebase/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebase/expected/file0 create mode 100644 test/integration/rebase/expected/file1 create mode 100644 test/integration/rebase/expected/file2 create mode 100644 test/integration/rebase/expected/file4 create mode 100644 test/integration/rebase/recording.json create mode 100644 test/integration/rebase/setup.sh create mode 100644 test/integration/rebase/test.json create mode 100644 test/integration/rebase2/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebase2/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebase2/expected/.git_keep/HEAD create mode 100644 test/integration/rebase2/expected/.git_keep/MERGE_MSG create mode 100644 test/integration/rebase2/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/rebase2/expected/.git_keep/REBASE_HEAD create mode 100644 test/integration/rebase2/expected/.git_keep/config create mode 100644 test/integration/rebase2/expected/.git_keep/description create mode 100644 test/integration/rebase2/expected/.git_keep/index create mode 100644 test/integration/rebase2/expected/.git_keep/info/exclude create mode 100644 test/integration/rebase2/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebase2/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebase2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebase2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf create mode 100644 test/integration/rebase2/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/rebase2/expected/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be create mode 100644 test/integration/rebase2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebase2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c create mode 100644 test/integration/rebase2/expected/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/rebase2/expected/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 create mode 100644 test/integration/rebase2/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 create mode 100644 test/integration/rebase2/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebase2/expected/file0 create mode 100644 test/integration/rebase2/expected/file1 create mode 100644 test/integration/rebase2/expected/file2 create mode 100644 test/integration/rebase2/expected/file4 create mode 100644 test/integration/rebase2/recording.json create mode 100644 test/integration/rebase2/setup.sh create mode 100644 test/integration/rebase2/test.json create mode 100644 test/integration/rebase3/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebase3/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebase3/expected/.git_keep/HEAD create mode 100644 test/integration/rebase3/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/rebase3/expected/.git_keep/config create mode 100644 test/integration/rebase3/expected/.git_keep/description create mode 100644 test/integration/rebase3/expected/.git_keep/index create mode 100644 test/integration/rebase3/expected/.git_keep/info/exclude create mode 100644 test/integration/rebase3/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebase3/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebase3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebase3/expected/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e create mode 100644 test/integration/rebase3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc create mode 100644 test/integration/rebase3/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/rebase3/expected/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c create mode 100644 test/integration/rebase3/expected/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebase3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/rebase3/expected/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac create mode 100644 test/integration/rebase3/expected/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 create mode 100644 test/integration/rebase3/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 create mode 100644 test/integration/rebase3/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebase3/expected/file0 create mode 100644 test/integration/rebase3/expected/file1 create mode 100644 test/integration/rebase3/expected/file2 create mode 100644 test/integration/rebase3/expected/file4 create mode 100644 test/integration/rebase3/recording.json create mode 100644 test/integration/rebase3/setup.sh create mode 100644 test/integration/rebase3/test.json create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/HEAD create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/config create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/description create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/index create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/info/exclude create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4d/c7f318f68fe1890dba6fb595009c4652c0a861 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/76/79fc004a4a40da12907d72ccef14991976aaff create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/7b/01314ccdeccc57cee454feca6369237410e786 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/8a/db7457de59c3945566ce7675a31bbf048b38ee create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/db/ab7e62cd7517f73425d46120a931a59c8eda6e create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 create mode 100644 test/integration/rebaseFixupAndSquash/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebaseFixupAndSquash/expected/file0 create mode 100644 test/integration/rebaseFixupAndSquash/expected/file1 create mode 100644 test/integration/rebaseFixupAndSquash/expected/file2 create mode 100644 test/integration/rebaseFixupAndSquash/expected/file4 create mode 100644 test/integration/rebaseFixupAndSquash/recording.json create mode 100644 test/integration/rebaseFixupAndSquash/setup.sh create mode 100644 test/integration/rebaseFixupAndSquash/test.json create mode 100644 test/integration/rebaseFixups/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebaseFixups/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebaseFixups/expected/.git_keep/HEAD create mode 100644 test/integration/rebaseFixups/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/rebaseFixups/expected/.git_keep/config create mode 100644 test/integration/rebaseFixups/expected/.git_keep/description create mode 100644 test/integration/rebaseFixups/expected/.git_keep/index create mode 100644 test/integration/rebaseFixups/expected/.git_keep/info/exclude create mode 100644 test/integration/rebaseFixups/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebaseFixups/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f create mode 100644 test/integration/rebaseFixups/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 create mode 100644 test/integration/rebaseFixups/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebaseFixups/expected/file0 create mode 100644 test/integration/rebaseFixups/expected/file1 create mode 100644 test/integration/rebaseFixups/expected/file2 create mode 100644 test/integration/rebaseFixups/expected/file4 create mode 100644 test/integration/rebaseFixups/expected/file5 create mode 100644 test/integration/rebaseFixups/expected/file6 create mode 100644 test/integration/rebaseFixups/recording.json create mode 100644 test/integration/rebaseFixups/setup.sh create mode 100644 test/integration/rebaseFixups/test.json create mode 100644 test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebaseReword/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebaseReword/expected/.git_keep/HEAD create mode 100644 test/integration/rebaseReword/expected/.git_keep/config create mode 100644 test/integration/rebaseReword/expected/.git_keep/description create mode 100644 test/integration/rebaseReword/expected/.git_keep/index create mode 100644 test/integration/rebaseReword/expected/.git_keep/info/exclude create mode 100644 test/integration/rebaseReword/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/17/19c3b9865f00407fbee59ee004104edc8bb62e create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebaseReword/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebaseReword/expected/file0 create mode 100644 test/integration/rebaseReword/expected/file1 create mode 100644 test/integration/rebaseReword/expected/file2 create mode 100644 test/integration/rebaseReword/recording.json create mode 100644 test/integration/rebaseReword/setup.sh create mode 100644 test/integration/rebaseReword/test.json create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/HEAD create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/REBASE_HEAD create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/config create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/description create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/index create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/info/exclude create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f create mode 100644 test/integration/rebaseSwapping/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebaseSwapping/expected/file0 create mode 100644 test/integration/rebaseSwapping/expected/file1 create mode 100644 test/integration/rebaseSwapping/expected/file2 create mode 100644 test/integration/rebaseSwapping/expected/file4 create mode 100644 test/integration/rebaseSwapping/recording.json create mode 100644 test/integration/rebaseSwapping/setup.sh create mode 100644 test/integration/rebaseSwapping/test.json create mode 100644 test/integration/stash/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stash/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/stash/expected/.git_keep/HEAD create mode 100644 test/integration/stash/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/stash/expected/.git_keep/config create mode 100644 test/integration/stash/expected/.git_keep/description create mode 100644 test/integration/stash/expected/.git_keep/index create mode 100644 test/integration/stash/expected/.git_keep/info/exclude create mode 100644 test/integration/stash/expected/.git_keep/logs/HEAD create mode 100644 test/integration/stash/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stash/expected/.git_keep/logs/refs/stash create mode 100644 test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 create mode 100644 test/integration/stash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 create mode 100644 test/integration/stash/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 create mode 100644 test/integration/stash/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e create mode 100644 test/integration/stash/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 create mode 100644 test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 create mode 100644 test/integration/stash/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 create mode 100644 test/integration/stash/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 create mode 100644 test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc create mode 100644 test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 create mode 100644 test/integration/stash/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stash/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c create mode 100644 test/integration/stash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stash/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff create mode 100644 test/integration/stash/expected/.git_keep/refs/heads/master create mode 100644 test/integration/stash/expected/.git_keep/refs/stash create mode 100644 test/integration/stash/expected/file0 create mode 100644 test/integration/stash/expected/file1 create mode 100644 test/integration/stash/expected/file2 create mode 100644 test/integration/stash/recording.json create mode 100644 test/integration/stash/setup.sh create mode 100644 test/integration/stash/test.json create mode 100644 test/integration/stashFiles/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stashFiles/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/stashFiles/expected/.git_keep/HEAD create mode 100644 test/integration/stashFiles/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/stashFiles/expected/.git_keep/config create mode 100644 test/integration/stashFiles/expected/.git_keep/description create mode 100644 test/integration/stashFiles/expected/.git_keep/index create mode 100644 test/integration/stashFiles/expected/.git_keep/info/exclude create mode 100644 test/integration/stashFiles/expected/.git_keep/logs/HEAD create mode 100644 test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashFiles/expected/.git_keep/logs/refs/stash create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/6c/a18002905d50a6a77808f8b7d50839f68da7b7 create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 create mode 100644 test/integration/stashFiles/expected/.git_keep/refs/heads/master create mode 100644 test/integration/stashFiles/expected/.git_keep/refs/stash create mode 100644 test/integration/stashFiles/expected/file0 create mode 100644 test/integration/stashFiles/expected/file1 create mode 100644 test/integration/stashFiles/expected/file2 create mode 100644 test/integration/stashFiles/expected/file3 create mode 100644 test/integration/stashFiles/recording.json create mode 100644 test/integration/stashFiles/setup.sh create mode 100644 test/integration/stashFiles/test.json create mode 100644 test/integration/stashNewBranch/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stashNewBranch/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/stashNewBranch/expected/.git_keep/HEAD create mode 100644 test/integration/stashNewBranch/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/stashNewBranch/expected/.git_keep/config create mode 100644 test/integration/stashNewBranch/expected/.git_keep/description create mode 100644 test/integration/stashNewBranch/expected/.git_keep/index create mode 100644 test/integration/stashNewBranch/expected/.git_keep/info/exclude create mode 100644 test/integration/stashNewBranch/expected/.git_keep/logs/HEAD create mode 100644 test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/hello create mode 100644 test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashNewBranch/expected/.git_keep/logs/refs/stash create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stashNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stashNewBranch/expected/.git_keep/refs/heads/hello create mode 100644 test/integration/stashNewBranch/expected/.git_keep/refs/heads/master create mode 100644 test/integration/stashNewBranch/expected/.git_keep/refs/stash create mode 100644 test/integration/stashNewBranch/expected/file0 create mode 100644 test/integration/stashNewBranch/expected/file1 create mode 100644 test/integration/stashNewBranch/expected/file2 create mode 100644 test/integration/stashNewBranch/expected/file3 create mode 100644 test/integration/stashNewBranch/recording.json create mode 100644 test/integration/stashNewBranch/setup.sh create mode 100644 test/integration/stashNewBranch/test.json create mode 100644 test/integration/tags2/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/tags2/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/tags2/expected/.git_keep/HEAD create mode 100644 test/integration/tags2/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/tags2/expected/.git_keep/config create mode 100644 test/integration/tags2/expected/.git_keep/description create mode 100644 test/integration/tags2/expected/.git_keep/index create mode 100644 test/integration/tags2/expected/.git_keep/info/exclude create mode 100644 test/integration/tags2/expected/.git_keep/logs/HEAD create mode 100644 test/integration/tags2/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/tags2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/tags2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/tags2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/tags2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/tags2/expected/.git_keep/objects/6e/cb690d237f4196cb3ec881669c7e9e348939c0 create mode 100644 test/integration/tags2/expected/.git_keep/objects/75/6089d39d55db6e11af06cb9c95f6d81f5d47ae create mode 100644 test/integration/tags2/expected/.git_keep/objects/7d/431518930a9fd2d08a09705645fe45d8507860 create mode 100644 test/integration/tags2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/tags2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/tags2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/tags2/expected/.git_keep/objects/dc/46c2541c98c11cce0ec0a67f7d95f81686b1e4 create mode 100644 test/integration/tags2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/tags2/expected/.git_keep/refs/heads/master create mode 100644 test/integration/tags2/expected/.git_keep/refs/tags/one create mode 100644 test/integration/tags2/expected/.git_keep/refs/tags/two create mode 100644 test/integration/tags2/expected/file0 create mode 100644 test/integration/tags2/expected/file1 create mode 100644 test/integration/tags2/expected/file2 create mode 100644 test/integration/tags2/recording.json create mode 100644 test/integration/tags2/setup.sh create mode 100644 test/integration/tags2/test.json create mode 100644 test/integration/tags3/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/tags3/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/tags3/expected/.git_keep/HEAD create mode 100644 test/integration/tags3/expected/.git_keep/config create mode 100644 test/integration/tags3/expected/.git_keep/description create mode 100644 test/integration/tags3/expected/.git_keep/index create mode 100644 test/integration/tags3/expected/.git_keep/info/exclude create mode 100644 test/integration/tags3/expected/.git_keep/logs/HEAD create mode 100644 test/integration/tags3/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/tags3/expected/.git_keep/logs/refs/heads/test create mode 100644 test/integration/tags3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/tags3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/tags3/expected/.git_keep/objects/29/ff87a318d242acab116d17e421480b5d8002cd create mode 100644 test/integration/tags3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/tags3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 create mode 100644 test/integration/tags3/expected/.git_keep/objects/54/bd2b22db1e849928a333ebfe8f3fba1159adde create mode 100644 test/integration/tags3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/tags3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/tags3/expected/.git_keep/objects/b8/1aa63f3545be4f565c8a64a943517c8da94a6e create mode 100644 test/integration/tags3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/tags3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/tags3/expected/.git_keep/objects/ec/f6d101974303948e79d673ccff18c592f89650 create mode 100644 test/integration/tags3/expected/.git_keep/refs/heads/master create mode 100644 test/integration/tags3/expected/.git_keep/refs/heads/test create mode 100644 test/integration/tags3/expected/.git_keep/refs/tags/one create mode 100644 test/integration/tags3/expected/file0 create mode 100644 test/integration/tags3/expected/file1 create mode 100644 test/integration/tags3/recording.json create mode 100644 test/integration/tags3/setup.sh create mode 100644 test/integration/tags3/test.json diff --git a/test/integration/branchSuggestions/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchSuggestions/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..dc3ab4abe --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file0 diff --git a/test/integration/branchSuggestions/expected/.git_keep/FETCH_HEAD b/test/integration/branchSuggestions/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/branchSuggestions/expected/.git_keep/HEAD b/test/integration/branchSuggestions/expected/.git_keep/HEAD new file mode 100644 index 000000000..e2b7d4d2e --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/new-branch-3 diff --git a/test/integration/branchSuggestions/expected/.git_keep/config b/test/integration/branchSuggestions/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/branchSuggestions/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/branchSuggestions/expected/.git_keep/description b/test/integration/branchSuggestions/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/branchSuggestions/expected/.git_keep/index b/test/integration/branchSuggestions/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..fbde0e92a42dd769dac9bb6deac5f011f651c65f GIT binary patch literal 137 zcmZ?q402{*U|<4b#)Rx6TXnNpD`7Mv0|N`2?j<({hQ=j8>90UFB0$V$A!2o9!9T5S z?}87#?_7HG(cY=1w-{K{GILT5fYJ;MAwjOLKuVIqP{Dvp&MtlD%-f=6YvmqvfBB$& eU-QWnr&VRm_b!PpR1;z5%bv0;j_dqpy#N67tu7M) literal 0 HcmV?d00001 diff --git a/test/integration/branchSuggestions/expected/.git_keep/info/exclude b/test/integration/branchSuggestions/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/branchSuggestions/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/branchSuggestions/expected/.git_keep/logs/HEAD b/test/integration/branchSuggestions/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..4deacbbf3 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/HEAD @@ -0,0 +1,8 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 commit (initial): file0 +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 checkout: moving from master to new-branch +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 checkout: moving from new-branch to new-branch-2 +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 checkout: moving from new-branch-2 to new-branch-3 +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 checkout: moving from new-branch-3 to old-branch +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 checkout: moving from old-branch to old-branch-2 +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 checkout: moving from old-branch-2 to old-branch-3 +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675450 +1000 checkout: moving from old-branch-3 to new-branch-3 diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/master b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..8c6dabf38 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 commit (initial): file0 diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch new file mode 100644 index 000000000..530a272f0 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 branch: Created from HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-2 b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-2 new file mode 100644 index 000000000..530a272f0 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-2 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 branch: Created from HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-3 b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-3 new file mode 100644 index 000000000..530a272f0 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-3 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 branch: Created from HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch new file mode 100644 index 000000000..530a272f0 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 branch: Created from HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-2 b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-2 new file mode 100644 index 000000000..530a272f0 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-2 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 branch: Created from HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-3 b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-3 new file mode 100644 index 000000000..530a272f0 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-3 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 CI 1617675445 +1000 branch: Created from HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/branchSuggestions/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/branchSuggestions/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/branchSuggestions/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/branchSuggestions/expected/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 b/test/integration/branchSuggestions/expected/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 new file mode 100644 index 000000000..16270b9a6 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 @@ -0,0 +1,2 @@ +xA +0Fa9ĀU4)<=o魭D4vWc% >VTQ՚4}pYz{x >8UGgafsc2'7u+ \ No newline at end of file diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/master b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..ae478b1c7 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch new file mode 100644 index 000000000..ae478b1c7 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch @@ -0,0 +1 @@ +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-2 b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-2 new file mode 100644 index 000000000..ae478b1c7 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-2 @@ -0,0 +1 @@ +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-3 b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-3 new file mode 100644 index 000000000..ae478b1c7 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-3 @@ -0,0 +1 @@ +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch new file mode 100644 index 000000000..ae478b1c7 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch @@ -0,0 +1 @@ +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-2 b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-2 new file mode 100644 index 000000000..ae478b1c7 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-2 @@ -0,0 +1 @@ +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-3 b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-3 new file mode 100644 index 000000000..ae478b1c7 --- /dev/null +++ b/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-3 @@ -0,0 +1 @@ +75e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/file0 b/test/integration/branchSuggestions/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/branchSuggestions/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/branchSuggestions/recording.json b/test/integration/branchSuggestions/recording.json new file mode 100644 index 000000000..207dbcb3f --- /dev/null +++ b/test/integration/branchSuggestions/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":639,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1752,"Mod":0,"Key":256,"Ch":99},{"Timestamp":2183,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2271,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2327,"Mod":0,"Key":256,"Ch":119},{"Timestamp":2599,"Mod":0,"Key":256,"Ch":45},{"Timestamp":3583,"Mod":0,"Key":9,"Ch":9},{"Timestamp":3880,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4175,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4815,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/branchSuggestions/setup.sh b/test/integration/branchSuggestions/setup.sh new file mode 100644 index 000000000..da9b9bddb --- /dev/null +++ b/test/integration/branchSuggestions/setup.sh @@ -0,0 +1,19 @@ +#!/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 + +git checkout -b new-branch +git checkout -b new-branch-2 +git checkout -b new-branch-3 +git checkout -b old-branch +git checkout -b old-branch-2 +git checkout -b old-branch-3 diff --git a/test/integration/branchSuggestions/test.json b/test/integration/branchSuggestions/test.json new file mode 100644 index 000000000..fafad1962 --- /dev/null +++ b/test/integration/branchSuggestions/test.json @@ -0,0 +1 @@ +{ "description": "Checking out a branch with name suggestions", "speed": 100 } diff --git a/test/integration/cherryPicking/expected/.git_keep/COMMIT_EDITMSG b/test/integration/cherryPicking/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..e4df020f1 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,15 @@ +fourth commit on develop + +# 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 696a8fd +# Last commands done (2 commands done): +# pick 234e2fa third commit on develop +# pick 0556e5d fourth commit on develop +# No commands remaining. +# You are currently rebasing branch 'other_branch' on '696a8fd'. +# +# Changes to be committed: +# modified: file5 +# diff --git a/test/integration/cherryPicking/expected/.git_keep/FETCH_HEAD b/test/integration/cherryPicking/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/cherryPicking/expected/.git_keep/HEAD b/test/integration/cherryPicking/expected/.git_keep/HEAD new file mode 100644 index 000000000..904a2e296 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/other_branch diff --git a/test/integration/cherryPicking/expected/.git_keep/ORIG_HEAD b/test/integration/cherryPicking/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..343995424 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +696a8fd43c580b3bed203977faab4566b052a4e4 diff --git a/test/integration/cherryPicking/expected/.git_keep/REBASE_HEAD b/test/integration/cherryPicking/expected/.git_keep/REBASE_HEAD new file mode 100644 index 000000000..40c059dd4 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/REBASE_HEAD @@ -0,0 +1 @@ +0556e5da1cda4e150d6cc1182be6efdb061f59fe diff --git a/test/integration/cherryPicking/expected/.git_keep/config b/test/integration/cherryPicking/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/cherryPicking/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/cherryPicking/expected/.git_keep/description b/test/integration/cherryPicking/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/cherryPicking/expected/.git_keep/index b/test/integration/cherryPicking/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..f68534e4edc11c99a7b9d7b1f5359499aab97f70 GIT binary patch literal 1356 zcmZ?q402{*U|<4bu7vE}WlS{(#bGof0|N`2Zr*AJhQ=if42)laYD9q8;aZ+T5BeVFt@3ycAmI z?wf;Vo+;G40wvYt13>e@G}OF6H1pW*XY*>GDSP&Y|CGWZbpbDbja^5i8Te8%i&B$I z@{20<(=u~X;pS;7Hi69p(opk)h%%2K)jT6e_!X#InN0_o2cn_o^`V)k5WD220!w&^ zZhQQbdtbdy_J|qlZeU=6xe6Q)1xh;WLcs0<(ol1PQO#k@xpUbgpnBo0{*=m{H&bpc zX4>?7?i>bIkU54R?}6g8KuQ1SLl_M;Cj`|T2Ia@=Vscy9Ul>%+K3=K3ui_-5Lw_E` z9B{G#nN!EM>5CeShMMz_cyqwX0c1|S^^E8FFdAY`z970e(zBj^z5mT{*D47vgY`FO z*f-x%KLv3QI2ka61i88by=TKssyB;zzSl=vu`MF9tMh_l03`PnD zT%W%ut#{E}*ZGTgoh?^%0M9}(gCjw%p}>5^_yQ#t7y?Z+Ff%b>Fn}=<8DE;Z$@<(# zTIW^7;r61U;o^*)*u+qbF@oua8`CkH|NhfY>uhU3v*lYKeAxJ_P^TB07>Y4w7{*9^ z$=p+1pQ9BqiS^Ol_vbci)f`@qO$@~ta|~mic&v;5W-ib>9{l%GL 1617673072 +1000 commit (initial): first commit +2cf63d6da8c52131dd79622f8572b44a1267e420 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 checkout: moving from master to feature/cherry-picking +2cf63d6da8c52131dd79622f8572b44a1267e420 e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc CI 1617673072 +1000 commit: first commit freshman year +e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc ef029771f117b5f31c972dfa546037662e243ca7 CI 1617673072 +1000 commit: second commit subway eat fresh +ef029771f117b5f31c972dfa546037662e243ca7 2493c87610e0a9b8edfca592cb01a027f60ce587 CI 1617673072 +1000 commit: third commit fresh +2493c87610e0a9b8edfca592cb01a027f60ce587 d8e5ca46d2bbd7c115e5849e637efe2361203368 CI 1617673072 +1000 commit: fourth commit cool +d8e5ca46d2bbd7c115e5849e637efe2361203368 78a5ec82970200538b70f5ac61c18acb45ccb8ee CI 1617673072 +1000 commit: fifth commit nice +78a5ec82970200538b70f5ac61c18acb45ccb8ee 19079c78db18112c5a2720896a040014a2d05f6d CI 1617673072 +1000 commit: sixth commit haha +19079c78db18112c5a2720896a040014a2d05f6d 4520f99d650662a3f597a200fea5f2599f528180 CI 1617673072 +1000 commit: seventh commit yeah +4520f99d650662a3f597a200fea5f2599f528180 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 commit: eighth commit woo +9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 checkout: moving from feature/cherry-picking to develop +9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 7923e4a952f4b169373b0389be6a9db3cd929547 CI 1617673072 +1000 commit: first commit on develop +7923e4a952f4b169373b0389be6a9db3cd929547 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 checkout: moving from develop to master +2cf63d6da8c52131dd79622f8572b44a1267e420 bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI 1617673072 +1000 commit: first commit on master +bfcc5725cd2ef871ff804996f4e02beef3e4dec2 7923e4a952f4b169373b0389be6a9db3cd929547 CI 1617673072 +1000 checkout: moving from master to develop +7923e4a952f4b169373b0389be6a9db3cd929547 7317cf7580efd92f974c8dfb3cde84eded8dafec CI 1617673072 +1000 commit: second commit on develop +7317cf7580efd92f974c8dfb3cde84eded8dafec bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI 1617673072 +1000 checkout: moving from develop to master +bfcc5725cd2ef871ff804996f4e02beef3e4dec2 f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI 1617673072 +1000 commit: second commit on master +f4ffac820a371104fe611d81bc13a45b70a3ebb3 7317cf7580efd92f974c8dfb3cde84eded8dafec CI 1617673072 +1000 checkout: moving from master to develop +7317cf7580efd92f974c8dfb3cde84eded8dafec 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI 1617673072 +1000 commit: third commit on develop +234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI 1617673072 +1000 checkout: moving from develop to master +f4ffac820a371104fe611d81bc13a45b70a3ebb3 facb56c48e4718f71c08116153c93d87bc699671 CI 1617673072 +1000 commit: third commit on master +facb56c48e4718f71c08116153c93d87bc699671 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI 1617673072 +1000 checkout: moving from master to develop +234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d 0556e5da1cda4e150d6cc1182be6efdb061f59fe CI 1617673072 +1000 commit: fourth commit on develop +0556e5da1cda4e150d6cc1182be6efdb061f59fe facb56c48e4718f71c08116153c93d87bc699671 CI 1617673072 +1000 checkout: moving from develop to master +facb56c48e4718f71c08116153c93d87bc699671 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 commit: fourth commit on master +339e2d062760be9ecdb4bb90f97bdb0e634e7831 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 checkout: moving from master to base_branch +339e2d062760be9ecdb4bb90f97bdb0e634e7831 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 commit: file +5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 checkout: moving from base_branch to other_branch +5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 checkout: moving from other_branch to base_branch +5d2484f3cb6ce658e296526c48e1a376b2790dfc 68728b56ed31d03ca94496b9e2a45c62ba0f4e8f CI 1617673072 +1000 commit: file changed +68728b56ed31d03ca94496b9e2a45c62ba0f4e8f 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 checkout: moving from base_branch to other_branch +5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673078 +1000 rebase -i (start): checkout HEAD +5d2484f3cb6ce658e296526c48e1a376b2790dfc 65c0438e428cd1aa94588eaa52eb7ebad7ec62fd CI 1617673078 +1000 rebase -i (pick): second commit subway eat fresh +65c0438e428cd1aa94588eaa52eb7ebad7ec62fd 16f2bcca6ce7bcc17277103a5555072a6c3322a2 CI 1617673078 +1000 rebase -i (pick): third commit fresh +16f2bcca6ce7bcc17277103a5555072a6c3322a2 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673078 +1000 rebase -i (pick): fourth commit cool +696a8fd43c580b3bed203977faab4566b052a4e4 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673078 +1000 rebase -i (finish): returning to refs/heads/other_branch +696a8fd43c580b3bed203977faab4566b052a4e4 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673084 +1000 rebase -i (start): checkout HEAD +696a8fd43c580b3bed203977faab4566b052a4e4 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI 1617673088 +1000 rebase -i (continue): fourth commit on develop +b8ab98a9ab0599193a3f41a9cc5cb988283e6722 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI 1617673088 +1000 rebase -i (finish): returning to refs/heads/other_branch diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/base_branch new file mode 100644 index 000000000..fbcf4b8c5 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/base_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 branch: Created from HEAD +339e2d062760be9ecdb4bb90f97bdb0e634e7831 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 commit: file +5d2484f3cb6ce658e296526c48e1a376b2790dfc 68728b56ed31d03ca94496b9e2a45c62ba0f4e8f CI 1617673072 +1000 commit: file changed diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/develop b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/develop new file mode 100644 index 000000000..3a497aff3 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/develop @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 branch: Created from HEAD +9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 7923e4a952f4b169373b0389be6a9db3cd929547 CI 1617673072 +1000 commit: first commit on develop +7923e4a952f4b169373b0389be6a9db3cd929547 7317cf7580efd92f974c8dfb3cde84eded8dafec CI 1617673072 +1000 commit: second commit on develop +7317cf7580efd92f974c8dfb3cde84eded8dafec 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI 1617673072 +1000 commit: third commit on develop +234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d 0556e5da1cda4e150d6cc1182be6efdb061f59fe CI 1617673072 +1000 commit: fourth commit on develop diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..73326cc0a --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 branch: Created from HEAD +2cf63d6da8c52131dd79622f8572b44a1267e420 e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc CI 1617673072 +1000 commit: first commit freshman year +e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc ef029771f117b5f31c972dfa546037662e243ca7 CI 1617673072 +1000 commit: second commit subway eat fresh +ef029771f117b5f31c972dfa546037662e243ca7 2493c87610e0a9b8edfca592cb01a027f60ce587 CI 1617673072 +1000 commit: third commit fresh +2493c87610e0a9b8edfca592cb01a027f60ce587 d8e5ca46d2bbd7c115e5849e637efe2361203368 CI 1617673072 +1000 commit: fourth commit cool +d8e5ca46d2bbd7c115e5849e637efe2361203368 78a5ec82970200538b70f5ac61c18acb45ccb8ee CI 1617673072 +1000 commit: fifth commit nice +78a5ec82970200538b70f5ac61c18acb45ccb8ee 19079c78db18112c5a2720896a040014a2d05f6d CI 1617673072 +1000 commit: sixth commit haha +19079c78db18112c5a2720896a040014a2d05f6d 4520f99d650662a3f597a200fea5f2599f528180 CI 1617673072 +1000 commit: seventh commit yeah +4520f99d650662a3f597a200fea5f2599f528180 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 commit: eighth commit woo diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/master b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..5222ab232 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 commit (initial): first commit +2cf63d6da8c52131dd79622f8572b44a1267e420 bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI 1617673072 +1000 commit: first commit on master +bfcc5725cd2ef871ff804996f4e02beef3e4dec2 f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI 1617673072 +1000 commit: second commit on master +f4ffac820a371104fe611d81bc13a45b70a3ebb3 facb56c48e4718f71c08116153c93d87bc699671 CI 1617673072 +1000 commit: third commit on master +facb56c48e4718f71c08116153c93d87bc699671 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 commit: fourth commit on master diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..eaa61b313 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 branch: Created from HEAD +5d2484f3cb6ce658e296526c48e1a376b2790dfc 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673078 +1000 rebase -i (finish): refs/heads/other_branch onto 5d2484f3cb6ce658e296526c48e1a376b2790dfc +696a8fd43c580b3bed203977faab4566b052a4e4 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI 1617673088 +1000 rebase -i (finish): refs/heads/other_branch onto 696a8fd43c580b3bed203977faab4566b052a4e4 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe b/test/integration/cherryPicking/expected/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe new file mode 100644 index 0000000000000000000000000000000000000000..5b38a6350a26839446fc86d6214dd213ea9a85a5 GIT binary patch literal 158 zcmV;P0Ac@l0gaA93d0}}0DJZodoL7MO;jkQkW-$q>V_0z3}Q;3U!fo9b(n#PCFfTI zg?MR|8JNhp7?5=`mNB^C(qe2#Q5nbHqmnj8oy0+v_a17)Y9UXuyUDUMKFFvDLrB9Q z**eFBE(to@S}II4+^6};AIitZw^;H6a6~&=Ev(9t+X}x7$_|O& Myp=t<8 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/cherryPicking/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d new file mode 100644 index 0000000000000000000000000000000000000000..8d42c4c9e2f8c317030a30193aef9945f0c8afa2 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 b/test/integration/cherryPicking/expected/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 new file mode 100644 index 000000000..ad4358bf6 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 @@ -0,0 +1,4 @@ +x +0ay L]1&Ʉ +Ɩ7{ZoPCò +}Ig.gHڇ`,9ɛX?:X=OeE&=8Rv젂^} oOiPV9tG%c:/} _s? \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/cherryPicking/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 new file mode 100644 index 0000000000000000000000000000000000000000..25389c9d662fa3c7c7b5b9b2c4a41240d70f394f GIT binary patch literal 34 qcmbL%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkxQPJ}D5PW-r6!l;7gaJOOuWvysr0#!pe$qVY%BjQe#sxdK}}1`%t~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/cherryPicking/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 new file mode 100644 index 0000000000000000000000000000000000000000..9b8af5fe783f2a13adddbc268c1af837ab15412a GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Gli0j#1aKh^<0JY{LH*` Yg_3-Qo5aj^EBNX zL`=K3x`WZ}MyVt&nzZ9#7&upvLQ$C{3b{&GvxG%ge>Pyz>?ZNZ7!h+Pm2t>wg^Wb4 zrfgQlJ?OiQ^9t7Djqs~r)KSA1 H03i literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/cherryPicking/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca new file mode 100644 index 0000000000000000000000000000000000000000..2b02dc3d14b4aef3343737214a03a09457e21e38 GIT binary patch literal 50 zcmb7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/cherryPicking/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 new file mode 100644 index 0000000000000000000000000000000000000000..1cafb95f9172da116f05816fbf223f92099aebbf GIT binary patch literal 144 zcmV;B0B`?z0V^p=O;s>5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^REF3kHx*dILv-8YpWOTEb+SjySa$=GydlG#%N_yM3vczORPMZ) ya%(Zurr&etASp0rc)Ttqw}t(MLG|q8mCE}nPBJ?5=OHODA*8?*s{#O;Tv8UZnMM@= literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 b/test/integration/cherryPicking/expected/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 new file mode 100644 index 0000000000000000000000000000000000000000..117d85d235f0e5b1a3cbf8de625568836c7c8b39 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s?mFkvt>FfcPQQAo~6Eh?%k$V|@8%u6?Bcs=38^^N8WZ%k=8 zxk>+m;mlj*Cy!%OX~M8YNKQ9vVVF{Ns-v^){T-2>EL#;!41ho(C9^0sxg@`+lHv3B zr1dVE>pFk&uCwKe4&YfRW^e>*T3TjKDnsm&n+h!9A-e7HPwsv7I@u#;th)h8-jLzW zWsiXBg}3@sDtF#YxwV*S)9<-+kQ5j*JYE-*+rs|BpnCT4O67eOCm9|3^N@@ KRRI91qI3pn2V^n; literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/cherryPicking/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af new file mode 100644 index 0000000000000000000000000000000000000000..27c11bb26067e0a43b68d14777da3f61ddfcceac GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/cherryPicking/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 new file mode 100644 index 0000000000000000000000000000000000000000..99177464395aa927a36557643ce3e4e536679578 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>ONEk*#1aKh^<0JY{LH*` Yg_3-Q#`K=jT^dhTTz I 2O؎Uo1o/TZ97e^Nyѷ0_- Ax \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/cherryPicking/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 new file mode 100644 index 0000000000000000000000000000000000000000..864410e1ec99041ddc8d8eac524028f2dea2a2bc GIT binary patch literal 327 zcmV-N0l5Bn0V^p=O;s>4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6 \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 b/test/integration/cherryPicking/expected/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 new file mode 100644 index 0000000000000000000000000000000000000000..6738ae2c27138fe3e505e1a242148c4a337b0b7e GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlw|zrke&tgr540ZMusELrPr1=UeatUWXYb*HShE z9PngK1SAmA!d(g@(K=)#O{}tH&N^z~RYhXxljFBNYJ+Kp>onix!)1TUCD(ETB#ab$ bA3Hds_ud`!n3(*jJKfsL;8(dXb$c(hItDk+ literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/cherryPicking/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 new file mode 100644 index 0000000000000000000000000000000000000000..ed74cea0ac22b5cf303dbcf79e5b7208e6720d90 GIT binary patch literal 150 zcmV;H0BQet0V^p=O;s>7HD)k0FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^Z_#007vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0y9GGs6`FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7jvWBSN{0B< C>3I79 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec b/test/integration/cherryPicking/expected/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec new file mode 100644 index 000000000..3863853b0 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec @@ -0,0 +1 @@ +x} 0= QA6>1`|o w jyFJH7_0A𚐇} U)}FJ{oX9o6z[|G, \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 b/test/integration/cherryPicking/expected/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 new file mode 100644 index 000000000..009c19542 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 @@ -0,0 +1,3 @@ +xK +0@]df@DcL)-5ނpx^k6`tBAgvlki)H$ؙEV7>fJ@ +{`HpA;b٦yrַ妇<#|aOh6M5S7}m/:L QR>8 \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/cherryPicking/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 new file mode 100644 index 000000000..e0670d284 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 @@ -0,0 +1 @@ +x 0CvL\jVОW=MA6DW-;G?EU&J~O2yMka(Th~~&m-`$2l>II_52&|+!QPm0npp40|0Z@bE@l~+$`&+<_Bp0IiO2% BL~H;6 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 b/test/integration/cherryPicking/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 new file mode 100644 index 0000000000000000000000000000000000000000..aafb5da95130b77089fc66e2d07a02845f8be98b GIT binary patch literal 33 pcmb4g3%pYvzD&lvWcY&Pr_@JZHVP-@|e008rm4L|?@ literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/cherryPicking/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 new file mode 100644 index 0000000000000000000000000000000000000000..27ac61738744e4923b0d928f7521dd5707074712 GIT binary patch literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/cherryPicking/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 new file mode 100644 index 0000000000000000000000000000000000000000..bfb5376c67ba79deb64b9463958ebd99b0ed9f64 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/cherryPicking/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 new file mode 100644 index 0000000000000000000000000000000000000000..236b6cdf4f4a62168a2e0b0b9b49cdcdbc22c808 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Lxqxz#1aKh^<0JY{LH*` Yg_3-QPKy literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f b/test/integration/cherryPicking/expected/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f new file mode 100644 index 000000000..dc3380093 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f @@ -0,0 +1,2 @@ +xA + @Ѯ=Bщ(R*ql5 B[|Z[1^!uT)rDm*kLyap@LE@鐵k_WȂ>D4fhJe>}=N>NO[{hCzNuE֗Y{< \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 b/test/integration/cherryPicking/expected/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 new file mode 100644 index 0000000000000000000000000000000000000000..cd43a8fa07691fe88f3be92c53dee5f1524a724f GIT binary patch literal 156 zcmV;N0Av4n0fmmu3c@fDggxgeau;N?Y5qV&=&6sf-KJD9ri2uHd>8cYTn2`3hT&Su zqiY0r>MdvOXAcS4#{m{_F4`d`W{YId!!pC-YywJA?bPzCYvWg(naOhw;wE4S1}r%d z1eDxbL_$SJ-)ht2q_5+2&u=RGGheutn{1figB4t#4FD)f9GGj0_FfcPQQAo~6Eh?%k$V|@8%u6?Bcs=38^^N8WZ%k=8 zxk>+m;mlj*Cy!%OX~M8YNKQ9vVVF{Ns-v^){T-2>EL#<@sWfF+zdSwUq_NuEnk!)j z%O$)NTITMXV`2aV3MrXIsmUezMU@PnzbCDC(OlR0i+7zZS9Ac+LNS9QP}9;fb5a>% zm)ulf2@lb2kAHIStJldMF=O2gNb-gZcP@JbR4=^MpHjK=X3DL_Oq+hsor9#nnBnod jnA{fj7Y5a{k5?-1t2oK%(4U8-z=V(jQ>+RAhvkGrKT2<8 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec b/test/integration/cherryPicking/expected/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec new file mode 100644 index 000000000..8d1ef58f3 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec @@ -0,0 +1,2 @@ +xK +0@]dI#LQ0MQ</jw0Z&3.`vȚYrD^iĦ8f"yH!fq)rz^6'8U>9V/zGjT?u_m<ڪ/:@ \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/cherryPicking/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 new file mode 100644 index 0000000000000000000000000000000000000000..c41ae5c621a9bf45b6c82cc55ae9068918c3caa0 GIT binary patch literal 328 zcmV-O0k{5m0V^p=O;s>4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6)pd#Os`!N}me}$};B8w({TNm;CV?)U>qBoK!=Gj>B{A aXr7$<-o˃h/޲7t̬NzN5:6ѯuP_?>c \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 b/test/integration/cherryPicking/expected/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 new file mode 100644 index 000000000..61b9dcca7 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 @@ -0,0 +1,3 @@ +xK +0@]dL#N6%F{ܠxjU:ّw^1Ȝ {#~M4cAH\^|tG+lsɫjRa:wu_eYgupֈzL5SWy +e)f@f \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/cherryPicking/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d new file mode 100644 index 0000000000000000000000000000000000000000..d63de558bc9f6f0096d5c3091fc31b9d8b2630eb GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>BZZQT#1aKh^<0JY{LH*` Yg_3-Q4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do(7VkpVTELH%bw9K4Tg}l<-q|_n>3x$%5#1aKh^<0JY{LH*` Yg_3-Q8G-fa~FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm|#@^04{ye Es|G`_Y5)KL literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 b/test/integration/cherryPicking/expected/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 new file mode 100644 index 0000000000000000000000000000000000000000..0cbe05fdae85f04ddee527ca824ffac7c1323024 GIT binary patch literal 154 zcmV;L0A>Gp0gaA93c@fD06pgwdlzK0?QRkf5qjz~(sW}5V@iqW^DX!Rufq&Xs-@f; z5cY?*se<#Jh|Jo@G)+V?XikJ|gA;L?Z70_H#JySLrq2dF6Xpo+tw6WiT`_Ff%bxNXyJgWsu`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/cherryPicking/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c new file mode 100644 index 0000000000000000000000000000000000000000..7302ca34e9d34bcda37b5a408f6b509933d555f2 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Q-zX@#1aKh^<0JY{LH*` Yg_3-Q7VkpVTELH%bw9K4Tg}l<-q|_n>6NQqD#1aKh^<0JY{LH*` Yg_3-Qb%7 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 b/test/integration/cherryPicking/expected/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 new file mode 100644 index 0000000000000000000000000000000000000000..5f7cb0d33058514d01688786b26419a0f4cfb30d GIT binary patch literal 162 zcmV;T0A2rh0ez0k3c@fD06pg`_AbaKo8|!`f~S7QCfQJ-HKj!H^DXGv>o5b8+p^p{ z7_AR|6Ml1u4 QXb&jzlDVzw0}BE`^Tg^&IsgCw literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e b/test/integration/cherryPicking/expected/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e new file mode 100644 index 0000000000000000000000000000000000000000..e6bbae5e8b8359e0bc366ab8e4e5fb6fb386629d GIT binary patch literal 254 zcmV9GGj0_FfcPQQAo~6Eh?%k$V|@8%u6?Bcs=38^^N8WZ%k=8 zxk>+m;mlj*Cy!%OX~M8YNKQ9vVVF{Ns-v^){T-2>EL#<@sWfF+zdSwUq_NuEnk!)j z%O$)NTITMXV`2aV3MrXIsmUezMU@PnzbCDC(OlR0i+7zZS9Ac+LNS9QP}9;fb5a>% zm)ulf2@lb2kAHIStJldMF=O2gNb-gZcP@JbR4=^MpHjK=X3DL_Oq+hsor9#nnBnod znA{fj7Y5a{k5?-1t2oK%(4U8-z=V(jQwHf-Pru&(X1HsW1ed}3n=|a2@2H;w0FzgR Eiv8ewr~m)} literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 b/test/integration/cherryPicking/expected/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 new file mode 100644 index 000000000..0f08b620f --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 @@ -0,0 +1,2 @@ +xM +0a9I&?U,S߀p>Ze8 6k66ŸfOFsN{l0eWF,*֕C.Dؠ4ue%r9ҒJJ):Nu3ykG> \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/cherryPicking/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 new file mode 100644 index 0000000000000000000000000000000000000000..008bb1a6567766c154b88180e8aa85b15392362c GIT binary patch literal 277 zcmV+w0qXvE0V^p=O;s>9GiER}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7i&B$I@{1}N5++{f+*JBpNKlqBcea)P7Qf_=-=L5F=8+@FfcPQQAo~6Eh?%k$V|@8%u6?Bcs=38^^N8WZ%k=8 zxk>+m;mlj*Cy$#L0D(eEW>IQ#Nq$i!!{_fw>s>V0b^hXAXUi2Gz_U=y;0V;Tw9K4T zhS()H64Fl8__FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMIIe0T3vpWEQ0+m*f{!G9*mA&bg`d zxsaeNWA1D#|1EyWAHP9OOUukjHDu^GJm-$)$*DgcF0(o7@qG8Sn>jmn003Pvs7;ya BlW+h4 literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/cherryPicking/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 new file mode 100644 index 0000000000000000000000000000000000000000..198bff1ec786820e0c2f41db6e2bed90f1e103fa GIT binary patch literal 201 zcmV;)05<=40V^p=O;s>5HfJz2FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRl&pn2ozE>i&B$I@{1}N5++{f z+*JBpNKlqBcea)P7Qf_=-=LUnlmaWCDT?q5i-ʪ? \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/cherryPicking/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 new file mode 100644 index 0000000000000000000000000000000000000000..af687b6201a28d6535fb8323c61b1d78ce5d3141 GIT binary patch literal 227 zcmV<90382#0V^p=O;s>5w`4FhFfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GxD20);Yl3A3RT#{c@$&fJdI_IX+=R$(AjJdO|{I~cefBXhDEiE%A)sUg% d@SHoEC#U{+xXk9P$MfCSZszRR0RVyibtbb-a`^xN literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/cherryPicking/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c new file mode 100644 index 000000000..74c919681 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c @@ -0,0 +1 @@ +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/cherryPicking/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/cherryPicking/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/cherryPicking/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e new file mode 100644 index 0000000000000000000000000000000000000000..3a7ee91eab601eb205b04a6e1e62c58599193222 GIT binary patch literal 50 zcmb7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/cherryPicking/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 new file mode 100644 index 0000000000000000000000000000000000000000..714e20cb7eb8a76c9832939c1e2a103d78bb257d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>bA^(O#1aKh^<0JY{LH*` Yg_3-Q>!qSWM){Gv*Rgo)QVH8F=H?^FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm=IE6id6vs H4=>-(3qr6K literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/cherryPicking/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 new file mode 100644 index 0000000000000000000000000000000000000000..4992422c7407bf6efc09d23127726c19cec1119d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>V}+88#1aKh^<0JY{LH*` Yg_3-Q;K^sCZHj{H%5Fvdy@DU`I?TY7X&f&d z$jhqFX5fW2mc-1ZsUU_(RTzg9ilJf4 znFzVm;`Gta(+tNG?2e~{y>z@^ZBwRk4?cJavPB_Sdqi|!`km_br|uRj)2+fUgXNK* Q`UcYuZMNm?K45Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0eS?hqn=r4HCq1PXDguIm6t(FP;-g-jLzWWsiXBg}3@sDtF#Y yxwV*S)9<-+kQ5j*JYE-*+rs|BpnCT4O67eOCm9|3^N@@RRI7%&rx)LLPgyG literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 b/test/integration/cherryPicking/expected/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 new file mode 100644 index 000000000..539d19c5f --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 @@ -0,0 +1,2 @@ +x}K + Ʈ@QAAq bZOp76WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!x%>_Mbe78s4VVdDO&3F04vc2TOwcJ2^O`ZlM180qhs?&a|$)CD9gzLJ%FN3;5 MiAS&17ZK<|A8)ZtHvj+t literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 b/test/integration/cherryPicking/expected/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 new file mode 100644 index 000000000..0b357276c --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 @@ -0,0 +1,2 @@ +xA +0E]dIDzI:cJ x?NVE` 9DΠk1U I#BB$f  A+~T]>\b7 K:n3!k?O]m+*(O?X \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/cherryPicking/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 new file mode 100644 index 0000000000000000000000000000000000000000..168b5c5f9141fac77b1554e5faa51680b0f39ef8 GIT binary patch literal 352 zcmV-m0iXVO0V^p=O;s?lFkmn=FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6ZbrQLc@`W;jN4S literal 0 HcmV?d00001 diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/base_branch b/test/integration/cherryPicking/expected/.git_keep/refs/heads/base_branch new file mode 100644 index 000000000..036ea7527 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/refs/heads/base_branch @@ -0,0 +1 @@ +68728b56ed31d03ca94496b9e2a45c62ba0f4e8f diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/develop b/test/integration/cherryPicking/expected/.git_keep/refs/heads/develop new file mode 100644 index 000000000..40c059dd4 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/refs/heads/develop @@ -0,0 +1 @@ +0556e5da1cda4e150d6cc1182be6efdb061f59fe diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/cherryPicking/expected/.git_keep/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..0f0bd273a --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/refs/heads/feature/cherry-picking @@ -0,0 +1 @@ +9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/master b/test/integration/cherryPicking/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..6940df038 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +339e2d062760be9ecdb4bb90f97bdb0e634e7831 diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/other_branch b/test/integration/cherryPicking/expected/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..f9041d125 --- /dev/null +++ b/test/integration/cherryPicking/expected/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +b8ab98a9ab0599193a3f41a9cc5cb988283e6722 diff --git a/test/integration/cherryPicking/expected/cherrypicking3 b/test/integration/cherryPicking/expected/cherrypicking3 new file mode 100644 index 000000000..eb90e8d7b --- /dev/null +++ b/test/integration/cherryPicking/expected/cherrypicking3 @@ -0,0 +1 @@ +this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/cherryPicking/expected/cherrypicking4 b/test/integration/cherryPicking/expected/cherrypicking4 new file mode 100644 index 000000000..b4121e2d6 --- /dev/null +++ b/test/integration/cherryPicking/expected/cherrypicking4 @@ -0,0 +1 @@ +this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/cherryPicking/expected/cherrypicking5 b/test/integration/cherryPicking/expected/cherrypicking5 new file mode 100644 index 000000000..afa76754c --- /dev/null +++ b/test/integration/cherryPicking/expected/cherrypicking5 @@ -0,0 +1 @@ +this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/cherryPicking/expected/directory/file b/test/integration/cherryPicking/expected/directory/file new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/cherryPicking/expected/directory/file @@ -0,0 +1 @@ +test3 diff --git a/test/integration/cherryPicking/expected/directory/file2 b/test/integration/cherryPicking/expected/directory/file2 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/cherryPicking/expected/directory/file2 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/cherryPicking/expected/file b/test/integration/cherryPicking/expected/file new file mode 100644 index 000000000..5da4d9200 --- /dev/null +++ b/test/integration/cherryPicking/expected/file @@ -0,0 +1 @@ +original1\noriginal2\noriginal3 diff --git a/test/integration/cherryPicking/expected/file1 b/test/integration/cherryPicking/expected/file1 new file mode 100644 index 000000000..dcd348507 --- /dev/null +++ b/test/integration/cherryPicking/expected/file1 @@ -0,0 +1,63 @@ +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 cat diff --git a/test/integration/cherryPicking/expected/file3 b/test/integration/cherryPicking/expected/file3 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/cherryPicking/expected/file3 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/cherryPicking/expected/file4 b/test/integration/cherryPicking/expected/file4 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/cherryPicking/expected/file4 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/cherryPicking/expected/file5 b/test/integration/cherryPicking/expected/file5 new file mode 100644 index 000000000..1b9ae5f5d --- /dev/null +++ b/test/integration/cherryPicking/expected/file5 @@ -0,0 +1 @@ +once upon a time there was a mouse diff --git a/test/integration/cherryPicking/recording.json b/test/integration/cherryPicking/recording.json new file mode 100644 index 000000000..e1323235b --- /dev/null +++ b/test/integration/cherryPicking/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":417,"Mod":0,"Key":259,"Ch":0},{"Timestamp":761,"Mod":0,"Key":258,"Ch":0},{"Timestamp":905,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1041,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1248,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1537,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1656,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1809,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1929,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2065,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2193,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2344,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2481,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3112,"Mod":0,"Key":256,"Ch":99},{"Timestamp":3624,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3777,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4009,"Mod":0,"Key":256,"Ch":67},{"Timestamp":4697,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4936,"Mod":0,"Key":256,"Ch":118},{"Timestamp":5296,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5881,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6024,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6456,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6816,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7041,"Mod":0,"Key":257,"Ch":0},{"Timestamp":7152,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7329,"Mod":0,"Key":257,"Ch":0},{"Timestamp":7424,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8184,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8329,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8497,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8673,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8856,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9041,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9233,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9640,"Mod":0,"Key":256,"Ch":99},{"Timestamp":10056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10208,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10736,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10872,"Mod":0,"Key":256,"Ch":99},{"Timestamp":11361,"Mod":0,"Key":259,"Ch":0},{"Timestamp":11640,"Mod":0,"Key":256,"Ch":118},{"Timestamp":12048,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12849,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13152,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14009,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14513,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14833,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15296,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16217,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17593,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/cherryPicking/setup.sh b/test/integration/cherryPicking/setup.sh new file mode 100644 index 000000000..d60a9a7e1 --- /dev/null +++ b/test/integration/cherryPicking/setup.sh @@ -0,0 +1,155 @@ +#!/bin/sh + +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 feature/cherry-picking + +echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 +echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 + +git add . + +git commit -am "first commit freshman year" + +echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 + +git add . + +git commit -am "second commit subway eat fresh" + +echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 + +git add . + +git commit -am "third commit fresh" + +echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 + +git add . + +git commit -am "fourth commit cool" + +echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 + +git add . + +git commit -am "fifth commit nice" + +echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 + +git add . + +git commit -am "sixth commit haha" + +echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 + +git add . + +git commit -am "seventh commit yeah" + +echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 + +git add . + +git commit -am "eighth commit woo" + + +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" + + +# this is for the autostash feature + +git checkout -b base_branch + +echo "original1\noriginal2\noriginal3" > file +git add file +git commit -m "file" + +git checkout -b other_branch + +git checkout base_branch + +echo "new1\noriginal2\noriginal3" > file +git add file +git commit -m "file changed" + +git checkout other_branch + diff --git a/test/integration/cherryPicking/test.json b/test/integration/cherryPicking/test.json new file mode 100644 index 000000000..e1cda77be --- /dev/null +++ b/test/integration/cherryPicking/test.json @@ -0,0 +1 @@ +{ "description": "Cherry picking commits over from another branch via the sub commits context. Also resolving some merge conflicts along the way.", "speed": 5 } diff --git a/test/integration/commitsNewBranch/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commitsNewBranch/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/commitsNewBranch/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/FETCH_HEAD b/test/integration/commitsNewBranch/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/commitsNewBranch/expected/.git_keep/HEAD b/test/integration/commitsNewBranch/expected/.git_keep/HEAD new file mode 100644 index 000000000..78bc9f37b --- /dev/null +++ b/test/integration/commitsNewBranch/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/lol diff --git a/test/integration/commitsNewBranch/expected/.git_keep/config b/test/integration/commitsNewBranch/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/commitsNewBranch/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/commitsNewBranch/expected/.git_keep/description b/test/integration/commitsNewBranch/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/commitsNewBranch/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/commitsNewBranch/expected/.git_keep/index b/test/integration/commitsNewBranch/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..577a68b72172fc15a3f87e26b0a1faa60bb1bc50 GIT binary patch literal 209 zcmZ?q402{*U|<5_gzWu4Sc2Y#!DvPX1{OBm4Ko-R8kaCIFn$H95dmU03lXa;3;tSAy~V(qmYI`k0F-860O@C~UbPHHL(N%_ZqCv@kN>Ks-uMy`8pV_E zbRod2rTZ$x97C` 1617674232 +1000 commit (initial): file0 +9901fd9b7766be600bed07f55f1794a759527a98 0029f9bf66e346d47ede6a501abb5b82bee60096 CI 1617674232 +1000 commit: file1 +0029f9bf66e346d47ede6a501abb5b82bee60096 e1cb250774fb8606d33062518d0ae03831130249 CI 1617674232 +1000 commit: file2 +e1cb250774fb8606d33062518d0ae03831130249 0029f9bf66e346d47ede6a501abb5b82bee60096 CI 1617674249 +1000 checkout: moving from master to lol diff --git a/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/lol b/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/lol new file mode 100644 index 000000000..1202f15d1 --- /dev/null +++ b/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/lol @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 0029f9bf66e346d47ede6a501abb5b82bee60096 CI 1617674249 +1000 branch: Created from 0029f9bf66e346d47ede6a501abb5b82bee60096 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/master b/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..5c02b3b2c --- /dev/null +++ b/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 9901fd9b7766be600bed07f55f1794a759527a98 CI 1617674232 +1000 commit (initial): file0 +9901fd9b7766be600bed07f55f1794a759527a98 0029f9bf66e346d47ede6a501abb5b82bee60096 CI 1617674232 +1000 commit: file1 +0029f9bf66e346d47ede6a501abb5b82bee60096 e1cb250774fb8606d33062518d0ae03831130249 CI 1617674232 +1000 commit: file2 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/00/29f9bf66e346d47ede6a501abb5b82bee60096 b/test/integration/commitsNewBranch/expected/.git_keep/objects/00/29f9bf66e346d47ede6a501abb5b82bee60096 new file mode 100644 index 0000000000000000000000000000000000000000..e5731eb1f4d78631bc2c56c8724942c5ffe4bec9 GIT binary patch literal 148 zcmV;F0Biqv0gaAL3c@fDMqTF=*$XoHn{hxy=&Hv^CKD`JTS^3vZ;s&hKJM1*u+cZD)o7erN7unXkb?68w`rz%^0e~6nIMww}+_dGT&inv)(>XxF C-$@1l literal 0 HcmV?d00001 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/commitsNewBranch/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/commitsNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/commitsNewBranch/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/commitsNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/commitsNewBranch/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/commitsNewBranch/expected/.git_keep/objects/99/01fd9b7766be600bed07f55f1794a759527a98 b/test/integration/commitsNewBranch/expected/.git_keep/objects/99/01fd9b7766be600bed07f55f1794a759527a98 new file mode 100644 index 0000000000000000000000000000000000000000..cd2e8264ccaebaa8a4b849490b323543bac4e0f9 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{Nyo&1h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ01^yvK7|l+lDl^?3&4+5w6ION*Z>Wx*2G``w2j7zp5ye!9_x3-ZEp2N;>0_z YcCd66W;SO%CmnxsQ=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commitsNewBranch/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/commitsNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/commitsNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/commitsNewBranch/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/commitsNewBranch/expected/.git_keep/objects/e1/cb250774fb8606d33062518d0ae03831130249 b/test/integration/commitsNewBranch/expected/.git_keep/objects/e1/cb250774fb8606d33062518d0ae03831130249 new file mode 100644 index 0000000000000000000000000000000000000000..fc22897ccdbcdc9c2febaa311381dd9e2b929736 GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fDMP26<*$Xn6wv!2n2wn9UlVpO0#+DMnCdX;-;*dqWJ;dIyxkz CNkm2f literal 0 HcmV?d00001 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/lol b/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/lol new file mode 100644 index 000000000..e92394760 --- /dev/null +++ b/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/lol @@ -0,0 +1 @@ +0029f9bf66e346d47ede6a501abb5b82bee60096 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/master b/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..d5689ed85 --- /dev/null +++ b/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +e1cb250774fb8606d33062518d0ae03831130249 diff --git a/test/integration/commitsNewBranch/expected/file0 b/test/integration/commitsNewBranch/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/commitsNewBranch/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/commitsNewBranch/expected/file1 b/test/integration/commitsNewBranch/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/commitsNewBranch/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/commitsNewBranch/recording.json b/test/integration/commitsNewBranch/recording.json new file mode 100644 index 000000000..ca4d07a4a --- /dev/null +++ b/test/integration/commitsNewBranch/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":972,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1243,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1812,"Mod":0,"Key":256,"Ch":120},{"Timestamp":2683,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3018,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3033,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3050,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3067,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3084,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3100,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3363,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3499,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3628,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3771,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3908,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4051,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4259,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4883,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5124,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5355,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6083,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6563,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7210,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9475,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10395,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11019,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11346,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11587,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11771,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11883,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12003,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12132,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12268,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12395,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12539,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12667,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12804,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12947,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13075,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13211,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13347,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13475,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13620,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13771,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13883,"Mod":0,"Key":258,"Ch":0},{"Timestamp":14027,"Mod":0,"Key":258,"Ch":0},{"Timestamp":14405,"Mod":0,"Key":27,"Ch":0},{"Timestamp":15540,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15995,"Mod":0,"Key":256,"Ch":110},{"Timestamp":17267,"Mod":0,"Key":256,"Ch":108},{"Timestamp":17396,"Mod":0,"Key":256,"Ch":111},{"Timestamp":17547,"Mod":0,"Key":256,"Ch":108},{"Timestamp":17675,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20195,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/commitsNewBranch/setup.sh b/test/integration/commitsNewBranch/setup.sh new file mode 100644 index 000000000..9b9e01321 --- /dev/null +++ b/test/integration/commitsNewBranch/setup.sh @@ -0,0 +1,20 @@ +#!/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 diff --git a/test/integration/commitsNewBranch/test.json b/test/integration/commitsNewBranch/test.json new file mode 100644 index 000000000..d760dcc6c --- /dev/null +++ b/test/integration/commitsNewBranch/test.json @@ -0,0 +1 @@ +{ "description": "Reverting a commit. Note here that our snapshot test fails if the commit SHA is included in the message hence the renaming of the revert commit after creating it", "speed": 20 } diff --git a/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/commitsRevert/expected/.git_keep/FETCH_HEAD b/test/integration/commitsRevert/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/commitsRevert/expected/.git_keep/HEAD b/test/integration/commitsRevert/expected/.git_keep/HEAD new file mode 100644 index 000000000..a9a1d2137 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/newbranch diff --git a/test/integration/commitsRevert/expected/.git_keep/config b/test/integration/commitsRevert/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/description b/test/integration/commitsRevert/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/commitsRevert/expected/.git_keep/index b/test/integration/commitsRevert/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..9ce0d669e725e71e5d48b10ed690a50614e1fd43 GIT binary patch literal 209 zcmZ?q402{*U|<5_gzN*NGR?n?VKgHH0}Gq(#$X19#w834j9-CjM1YvhLd5FIf`3}u z-UT0e-?{YWqrFp2Z!xf@W#*(B0HqliK>B4@JS~RNP;;`-%~`tV@n6-{8($(qqj>V2 zE(CbBbYF#-V+b}UB*@hj$dF_(QZV4UP(UC!TAHTAEZGMlHH<8-4Nw>NL@ S4zYYHohM_t=*AL>+$sREPe(og literal 0 HcmV?d00001 diff --git a/test/integration/commitsRevert/expected/.git_keep/info/exclude b/test/integration/commitsRevert/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/logs/HEAD b/test/integration/commitsRevert/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..f477d1f97 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 3e9204493881a93d230aa85233c4721b6e83268d CI 1617674261 +1000 commit (initial): file0 +3e9204493881a93d230aa85233c4721b6e83268d 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674261 +1000 commit: file1 +592b94b2f4dc9b7831efbd76f711f6232448730e 0842967ae6f16d85995f718922256cea03d10b4e CI 1617674261 +1000 commit: file2 +0842967ae6f16d85995f718922256cea03d10b4e 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674264 +1000 checkout: moving from master to newbranch diff --git a/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master b/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..42c7cd4a3 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 3e9204493881a93d230aa85233c4721b6e83268d CI 1617674261 +1000 commit (initial): file0 +3e9204493881a93d230aa85233c4721b6e83268d 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674261 +1000 commit: file1 +592b94b2f4dc9b7831efbd76f711f6232448730e 0842967ae6f16d85995f718922256cea03d10b4e CI 1617674261 +1000 commit: file2 diff --git a/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch b/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch new file mode 100644 index 000000000..16b1076b3 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674264 +1000 branch: Created from 592b94b2f4dc9b7831efbd76f711f6232448730e diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e b/test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e new file mode 100644 index 000000000..932545521 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e @@ -0,0 +1,2 @@ +xK +0@] ]`DnǫۺBK?DlLUna֢mp@QX}X͞yw;$,)j*DK=䝘do^Enu[♧sT?u"h~R9 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/objects/3e/9204493881a93d230aa85233c4721b6e83268d b/test/integration/commitsRevert/expected/.git_keep/objects/3e/9204493881a93d230aa85233c4721b6e83268d new file mode 100644 index 000000000..4084ff6cb --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/objects/3e/9204493881a93d230aa85233c4721b6e83268d @@ -0,0 +1,3 @@ +xA +0Fa9cb@U4АR"x|{nպtK| +!$bharTi;i/mmnM; ]QIInʲd+ \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/59/2b94b2f4dc9b7831efbd76f711f6232448730e b/test/integration/commitsRevert/expected/.git_keep/objects/59/2b94b2f4dc9b7831efbd76f711f6232448730e new file mode 100644 index 000000000..44166baee --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/objects/59/2b94b2f4dc9b7831efbd76f711f6232448730e @@ -0,0 +1,2 @@ +x1 +0 @>B$GBCH\#t붮sP3_CbբVi$*RX"Gpn`P )DrDȖ 9W'Oʺ/vm}x`H"2+Yϩfr7͋8 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/commitsRevert/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/commitsRevert/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/commitsRevert/expected/.git_keep/refs/heads/master b/test/integration/commitsRevert/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..8cebe1d71 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +0842967ae6f16d85995f718922256cea03d10b4e diff --git a/test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch b/test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch new file mode 100644 index 000000000..dd2e9bde8 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch @@ -0,0 +1 @@ +592b94b2f4dc9b7831efbd76f711f6232448730e diff --git a/test/integration/commitsRevert/expected/file0 b/test/integration/commitsRevert/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/commitsRevert/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/commitsRevert/expected/file1 b/test/integration/commitsRevert/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/commitsRevert/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/commitsRevert/recording.json b/test/integration/commitsRevert/recording.json new file mode 100644 index 000000000..829287a3a --- /dev/null +++ b/test/integration/commitsRevert/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":471,"Mod":0,"Key":259,"Ch":0},{"Timestamp":694,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1015,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1703,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2503,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2622,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2653,"Mod":0,"Key":256,"Ch":119},{"Timestamp":2783,"Mod":0,"Key":256,"Ch":98},{"Timestamp":2878,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2950,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2990,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3110,"Mod":0,"Key":256,"Ch":99},{"Timestamp":3151,"Mod":0,"Key":256,"Ch":104},{"Timestamp":3398,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4102,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/commitsRevert/setup.sh b/test/integration/commitsRevert/setup.sh new file mode 100644 index 000000000..9b9e01321 --- /dev/null +++ b/test/integration/commitsRevert/setup.sh @@ -0,0 +1,20 @@ +#!/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 diff --git a/test/integration/commitsRevert/test.json b/test/integration/commitsRevert/test.json new file mode 100644 index 000000000..d760dcc6c --- /dev/null +++ b/test/integration/commitsRevert/test.json @@ -0,0 +1 @@ +{ "description": "Reverting a commit. Note here that our snapshot test fails if the commit SHA is included in the message hence the renaming of the revert commit after creating it", "speed": 20 } diff --git a/test/integration/rebase/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebase/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..bdc8c7f7b --- /dev/null +++ b/test/integration/rebase/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,30 @@ +# This is a combination of 3 commits. +# This is the 1st commit message: + +file1 + +# This is the commit message #2: + +file2 + +# The commit message #3 will be skipped: + +# 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 11:39:15 2021 +1000 +# +# interactive rebase in progress; onto ecfc580 +# Last commands done (3 commands done): +# squash faaf373 file2 +# fixup 578ebf1 file4 +# No commands remaining. +# You are currently rebasing branch 'master' on 'ecfc580'. +# +# Changes to be committed: +# new file: file1 +# new file: file2 +# new file: file4 +# diff --git a/test/integration/rebase/expected/.git_keep/FETCH_HEAD b/test/integration/rebase/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebase/expected/.git_keep/HEAD b/test/integration/rebase/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebase/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebase/expected/.git_keep/ORIG_HEAD b/test/integration/rebase/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..a7cdb7ad7 --- /dev/null +++ b/test/integration/rebase/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +47614f63053804bc596291b8f7cff3b460b1b3ee diff --git a/test/integration/rebase/expected/.git_keep/config b/test/integration/rebase/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebase/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/rebase/expected/.git_keep/description b/test/integration/rebase/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebase/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebase/expected/.git_keep/index b/test/integration/rebase/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..afd9d4a73d7a0d19256bedc208d81fc4f3de44c2 GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1rxhj{}Ff5B)*pctEO=>!Ib#w834j9-CjM1YvhLd5FIf`3}u z-UT0e-?{YWqrFp2Z!xf@W#*(B0HqlifclRZH{Xze(NJ@~qnopI&*Q(UsW-kvghuh? zJ6#CyYU#cTF~<;Q&T-S 1617673155 +1000 commit (initial): file0 +ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI 1617673155 +1000 commit: file1 +47614f63053804bc596291b8f7cff3b460b1b3ee faaf373a925c1e335894ebf4343a00a917f04edc CI 1617673155 +1000 commit: file2 +faaf373a925c1e335894ebf4343a00a917f04edc 578ebf1736e797b78fb670c718ebf177936eb2ef CI 1617673155 +1000 commit: file4 +578ebf1736e797b78fb670c718ebf177936eb2ef ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI 1617673156 +1000 rebase -i (start): checkout ecfc5809e3397bbda6bd4c9f47267a8c5f22346c +ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI 1617673156 +1000 rebase -i: fast-forward +47614f63053804bc596291b8f7cff3b460b1b3ee e8ece6af94d443b67962124243509d8f61a29758 CI 1617673159 +1000 rebase -i (squash): # This is a combination of 2 commits. +e8ece6af94d443b67962124243509d8f61a29758 1824d7294d6d3524d83510db27086177a6db97bf CI 1617673159 +1000 rebase -i (fixup): file1 +1824d7294d6d3524d83510db27086177a6db97bf 1824d7294d6d3524d83510db27086177a6db97bf CI 1617673159 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebase/expected/.git_keep/logs/refs/heads/master b/test/integration/rebase/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..5fc8a0547 --- /dev/null +++ b/test/integration/rebase/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI 1617673155 +1000 commit (initial): file0 +ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI 1617673155 +1000 commit: file1 +47614f63053804bc596291b8f7cff3b460b1b3ee faaf373a925c1e335894ebf4343a00a917f04edc CI 1617673155 +1000 commit: file2 +faaf373a925c1e335894ebf4343a00a917f04edc 578ebf1736e797b78fb670c718ebf177936eb2ef CI 1617673155 +1000 commit: file4 +578ebf1736e797b78fb670c718ebf177936eb2ef 1824d7294d6d3524d83510db27086177a6db97bf CI 1617673159 +1000 rebase -i (finish): refs/heads/master onto ecfc5809e3397bbda6bd4c9f47267a8c5f22346c diff --git a/test/integration/rebase/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase/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/rebase/expected/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf b/test/integration/rebase/expected/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf new file mode 100644 index 0000000000000000000000000000000000000000..c3cd3b60858cae1a8218fa25f3214fb58cdfdf14 GIT binary patch literal 155 zcmV;M0A&Ao0fo-X3c@fDg<;ouitGi+WhUu>h|pCZW0Fp=(AW|p`1lra@9MzMw>WvL zb?Mp?oq7||0D>j}1A-q)VJ|^|O|bxg=)@f|2}QMYlV{hGOUA*Fcuz5>fvKd#EMidEln J>I311J2T8ZONamf literal 0 HcmV?d00001 diff --git a/test/integration/rebase/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase/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/rebase/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase/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/rebase/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 new file mode 100644 index 0000000000000000000000000000000000000000..39b5247e9c4f795126961919183ac72602b03cfa 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 hDKKHUpUta%rtH}p{!H5Q8JP_d6S?A{W=@2$7B9{l2pAw(wbLQ*p@l2Q$)I?TDd$3vOJJ-aIY=~d ztj_rWtmrdd{m}EG@ALAMFSUJ>8~66m7Hop#ZH)SAjWO!1=hTotxvJ|XR{a3x`Z^{y Cxk_gM literal 0 HcmV?d00001 diff --git a/test/integration/rebase/expected/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef b/test/integration/rebase/expected/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef new file mode 100644 index 0000000000000000000000000000000000000000..794aeab98e8657357a6d9c24bbd71a26001557e0 GIT binary patch literal 146 zcmV;D0B!$x0gcW<3c@fDKvCB@MfQTsWM&crB0^U^#xzc_(AZKUczk;Vx1YE8Wo>Ql z9&>(O97(Gm8WZnDb;gxlMO_cVAU2CDI(Epb^P6vrUzWNdYut zs=)RvPCxy%?tU2kZ5SW+)wV5mDQmlXjF@5~6!B*S0C&`5s@tF3)p;>?KN(s${M7_Q AEC2ui literal 0 HcmV?d00001 diff --git a/test/integration/rebase/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase/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/rebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase/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/rebase/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/rebase/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/rebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/rebase/expected/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 b/test/integration/rebase/expected/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 new file mode 100644 index 000000000..1e37ae032 --- /dev/null +++ b/test/integration/rebase/expected/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 @@ -0,0 +1,3 @@ +xj1 Ю, +*l˝x)n +Z]]k)KS߈shy.9r\XC:I(!$4!MJcET }\rFX+3Zó:qRWW03h}_ANF? +r}yy_ \ No newline at end of file diff --git a/test/integration/rebase/expected/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c b/test/integration/rebase/expected/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c new file mode 100644 index 0000000000000000000000000000000000000000..2d6a8e55bd29678ab10d1c839f4b82b668dda0fc GIT binary patch literal 119 zcmV--0Eqv10gcT;3c@fDMq$@E#q0%{NhgT`5uvLdBWeC%p`oQj@c8x!ZXX}Kd24Oy zB&wHw03;aTLyj?)EH3y|1mJtFTG{4OZG=WuYtpB`w}Zxs9^>@FH?@7mZQk0G#7ppD Z5a;MB%xunjPCEYNrY%~35{Z$>*iubZdp`I*w2J|q1Pk60xKe!zCSf6oRm2t- zpkT4gDu2dnJM=W``!qlKoBO`IaYMIi8ur BMS%bS literal 0 HcmV?d00001 diff --git a/test/integration/rebase/expected/.git_keep/refs/heads/master b/test/integration/rebase/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..19cc8c02c --- /dev/null +++ b/test/integration/rebase/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +1824d7294d6d3524d83510db27086177a6db97bf diff --git a/test/integration/rebase/expected/file0 b/test/integration/rebase/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebase/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebase/expected/file1 b/test/integration/rebase/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebase/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebase/expected/file2 b/test/integration/rebase/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebase/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebase/expected/file4 b/test/integration/rebase/expected/file4 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/rebase/expected/file4 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/rebase/recording.json b/test/integration/rebase/recording.json new file mode 100644 index 000000000..8c1042333 --- /dev/null +++ b/test/integration/rebase/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":595,"Mod":0,"Key":259,"Ch":0},{"Timestamp":780,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1044,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1187,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1483,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2492,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2763,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3125,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3419,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4132,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4555,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5260,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebase/setup.sh b/test/integration/rebase/setup.sh new file mode 100644 index 000000000..d11e86c0a --- /dev/null +++ b/test/integration/rebase/setup.sh @@ -0,0 +1,24 @@ +#!/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 test3 > file4 +git add . +git commit -am file4 diff --git a/test/integration/rebase/test.json b/test/integration/rebase/test.json new file mode 100644 index 000000000..20830b099 --- /dev/null +++ b/test/integration/rebase/test.json @@ -0,0 +1 @@ +{ "description": "basic rebase of commits", "speed": 10 } diff --git a/test/integration/rebase2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebase2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..b6651993b --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,16 @@ +file4-changed-again + +# 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 4aedafb +# Last commands done (2 commands done): +# edit 26d430f file4-added +# pick c390128 file4-changed-again +# Next command to do (1 remaining command): +# pick bce4745 file4-changed +# You are currently rebasing branch 'master' on '4aedafb'. +# +# Changes to be committed: +# modified: file4 +# diff --git a/test/integration/rebase2/expected/.git_keep/FETCH_HEAD b/test/integration/rebase2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebase2/expected/.git_keep/HEAD b/test/integration/rebase2/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebase2/expected/.git_keep/MERGE_MSG b/test/integration/rebase2/expected/.git_keep/MERGE_MSG new file mode 100644 index 000000000..ebd2bf400 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/MERGE_MSG @@ -0,0 +1,4 @@ +file4-changed + +# Conflicts: +# file4 diff --git a/test/integration/rebase2/expected/.git_keep/ORIG_HEAD b/test/integration/rebase2/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..35cc5f3a8 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +26d430fb59900099e9992a3c79f30e42309cdce3 diff --git a/test/integration/rebase2/expected/.git_keep/REBASE_HEAD b/test/integration/rebase2/expected/.git_keep/REBASE_HEAD new file mode 100644 index 000000000..5474caaf2 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/REBASE_HEAD @@ -0,0 +1 @@ +bce4745137c540943900ca78e4b31dd1315bf57c diff --git a/test/integration/rebase2/expected/.git_keep/config b/test/integration/rebase2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebase2/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/rebase2/expected/.git_keep/description b/test/integration/rebase2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebase2/expected/.git_keep/index b/test/integration/rebase2/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..ce23575031fc314fb624218fd1110e89159e0d2d GIT binary patch literal 429 zcmZ?q402{*U|<4bmW1p*p=vC@*TZN=pctEOwGRVB;}Ql2#;-s%B0$V$A!2o9!9T5S z?}87#?_7HG(cY=1w-{K{GILT5fYJ;MApPo6zn{Tqs5!~#<}BUw_^)c}jV}?QQ9Suh z7XrLmy01daF@&3=VKmVTWDbainp1*qjs(vSqXwmY=U%Q_6kgTe@=ANYg*wC>BbYgH z7WWk;faZW{h&eUP=;rvF{pV6_h lSLrWKTYO21z4bao@z;Hh!z(v!FMHY>_n+fP$SW5WWdQ1Mk2C-P literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/info/exclude b/test/integration/rebase2/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/rebase2/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/rebase2/expected/.git_keep/logs/HEAD b/test/integration/rebase2/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..5b27757c9 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 f94292928d0bc034fe88c753306b1959300e1264 CI 1617673301 +1000 commit (initial): file0 +f94292928d0bc034fe88c753306b1959300e1264 61baf480bb5ddfad6d66c785b321d4aadd5367b4 CI 1617673301 +1000 commit: file1 +61baf480bb5ddfad6d66c785b321d4aadd5367b4 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI 1617673301 +1000 commit: file2 +4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI 1617673301 +1000 commit: file4-added +26d430fb59900099e9992a3c79f30e42309cdce3 bce4745137c540943900ca78e4b31dd1315bf57c CI 1617673301 +1000 commit: file4-changed +bce4745137c540943900ca78e4b31dd1315bf57c c3901284a9e7fc063d6fa7f0c5797d031445ba45 CI 1617673301 +1000 commit: file4-changed-again +c3901284a9e7fc063d6fa7f0c5797d031445ba45 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI 1617673303 +1000 rebase -i (start): checkout 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf +4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI 1617673303 +1000 rebase -i: fast-forward +26d430fb59900099e9992a3c79f30e42309cdce3 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI 1617673309 +1000 rebase -i (continue): file4-changed-again +c36e808d2fa61e16952b7d0ffb8f18d08156cc94 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI 1617673311 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebase2/expected/.git_keep/logs/refs/heads/master b/test/integration/rebase2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..755240ff0 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 f94292928d0bc034fe88c753306b1959300e1264 CI 1617673301 +1000 commit (initial): file0 +f94292928d0bc034fe88c753306b1959300e1264 61baf480bb5ddfad6d66c785b321d4aadd5367b4 CI 1617673301 +1000 commit: file1 +61baf480bb5ddfad6d66c785b321d4aadd5367b4 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI 1617673301 +1000 commit: file2 +4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI 1617673301 +1000 commit: file4-added +26d430fb59900099e9992a3c79f30e42309cdce3 bce4745137c540943900ca78e4b31dd1315bf57c CI 1617673301 +1000 commit: file4-changed +bce4745137c540943900ca78e4b31dd1315bf57c c3901284a9e7fc063d6fa7f0c5797d031445ba45 CI 1617673301 +1000 commit: file4-changed-again +c3901284a9e7fc063d6fa7f0c5797d031445ba45 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI 1617673311 +1000 rebase -i (finish): refs/heads/master onto 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf diff --git a/test/integration/rebase2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase2/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/rebase2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase2/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/rebase2/expected/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 b/test/integration/rebase2/expected/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 new file mode 100644 index 000000000..d2eef9a41 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 @@ -0,0 +1,3 @@ +xM +0@a9Ed]d Ɩ#}|Wޗ!ؙ5"{УK"80@D-[ȹpjC#q#)@ZɋT!Zc +E}s44?K}{!@ 9 ucj\bPk <9 \ No newline at end of file diff --git a/test/integration/rebase2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase2/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/rebase2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 new file mode 100644 index 0000000000000000000000000000000000000000..39b5247e9c4f795126961919183ac72602b03cfa 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 hDKKHUpUta%rtH}p{!aH{pn-DDY`OOo09fo1b*4ol7 zjCkpXsvVVxlaoS1D1uybmEa&nt%($f(C321?0o3E+X$KKKrZJXQdy$JSQ3To5oBN% z2|lJg82{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 b/test/integration/rebase2/expected/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 new file mode 100644 index 000000000..63f61eda9 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 @@ -0,0 +1,2 @@ +xA +0E]d&I]dƖ#}އ'{kb{i*dAEd ex(٩u<wrg̸:_t% QoҧoǦ7(P _=韺)d~*<8 \ No newline at end of file diff --git a/test/integration/rebase2/expected/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be b/test/integration/rebase2/expected/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be new file mode 100644 index 0000000000000000000000000000000000000000..74d27cc543ebea27a59629a63201816ba2dd33bd GIT binary patch literal 65 zcmV-H0KWft0ZYosPf{>5W3Yh$1rJw87p{`j;u2FXTL=L2Ot|bIKp`nP)x_MyR8LP& XAuTf})kHTrBQY;MHH8ZR*ZUL=BiI*? literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase2/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/rebase2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase2/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/rebase2/expected/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 b/test/integration/rebase2/expected/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 new file mode 100644 index 0000000000000000000000000000000000000000..44282752cd1fa5472cd5f62089af83d545773f2a GIT binary patch literal 71 zcmV-N0J#5n0ZYosPf{>9Vz7Y#1rJw87p{`j;u2#nTL=L2Ou6hJKq1-K(!kKjLQhXm dAuTf})kHTrBQY;MHAOcuJux$n3jj=^71G=)8VLXZ literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c b/test/integration/rebase2/expected/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c new file mode 100644 index 0000000000000000000000000000000000000000..6b9a1097fcd50f24e6097f4f2b022e5bf79f02a7 GIT binary patch literal 153 zcmV;K0A~Mq0gaA93WG2ZMZ3-^vM()@%p^KcO2L)Kh~uORMnzKS@#_(~{k-@1vXwGd z>j5tHP_-i9hU`KM1TirB95etDF!<=R1E89~V- zu#BQ;(x*<_VY}Wwy8fl#RQ5&hvX!TG(KWF_1ZS`AteA5>PgVUBH+f!^ZZf6yt)uw? H8E86(K6Fd_ literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 b/test/integration/rebase2/expected/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 new file mode 100644 index 0000000000000000000000000000000000000000..94af91a3ef444cabdbf5fde6795252b8e84eb75d GIT binary patch literal 161 zcmV;S0ABxi0fml13WG2ZMZ3-^vM-iNCPoKJDY)t}lF38`qaqf1{ASU8w~zNepSM!x zQ(N$t^AOQFV~*aYklE&xfO{j!yT}G@Y_aW~v|_}nJsh&u&?kqGV@m`8L_$P1Aa|4z z#90L5#DXfk&uKgK@Y46;^^{L2`yw~q%0nA(I^Q9J(N|MfRHgOQDSveO=_=2QxQ3^& Pj*^-%hIv(A48uO#Vs=m> literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 b/test/integration/rebase2/expected/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 new file mode 100644 index 0000000000000000000000000000000000000000..3eb14d8c901c825ea71cfc61402f79e6db25e580 GIT binary patch literal 158 zcmV;P0Ac@l0gcW}3WG2ZfZ?ulitLMJCXed_DO=Tv#Rlt;0y_(xr4E2&XvHSN zoRQF_;sUGqsndSye$dZ;c*{4g$085j*Ox|*!3QEheMbOLSG}gH{K-|B7qJabaT_H! Mag6h(ejSiL?X0RyyZ`_I literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebase2/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 new file mode 100644 index 0000000000000000000000000000000000000000..f390e4e4d3fe101fe8c866915505529f902e024f 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 hDKKHUWODRD_&=j#Wv|j-oVNIq6npD+2mpg5JH=58JZAs^ literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/rebase2/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/rebase2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebase2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 b/test/integration/rebase2/expected/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 new file mode 100644 index 000000000..db145ed54 --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 @@ -0,0 +1,2 @@ +xA +0Fa9IĀU4)<=o魭D4v>cr >VTQ՚4}pYz{x >8Bgafsc2'7uو+ \ No newline at end of file diff --git a/test/integration/rebase2/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebase2/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 new file mode 100644 index 0000000000000000000000000000000000000000..f082bca50cf286002d22a8ec7fdbd56a3734044c 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 hDKKI1H_4Z}x=U01mLlh)SBpN~-`)0+9{^tJIj&$}J`Df> literal 0 HcmV?d00001 diff --git a/test/integration/rebase2/expected/.git_keep/refs/heads/master b/test/integration/rebase2/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..770158eac --- /dev/null +++ b/test/integration/rebase2/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +c36e808d2fa61e16952b7d0ffb8f18d08156cc94 diff --git a/test/integration/rebase2/expected/file0 b/test/integration/rebase2/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebase2/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebase2/expected/file1 b/test/integration/rebase2/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebase2/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebase2/expected/file2 b/test/integration/rebase2/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebase2/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebase2/expected/file4 b/test/integration/rebase2/expected/file4 new file mode 100644 index 000000000..4f346f1ad --- /dev/null +++ b/test/integration/rebase2/expected/file4 @@ -0,0 +1 @@ +test5 diff --git a/test/integration/rebase2/recording.json b/test/integration/rebase2/recording.json new file mode 100644 index 000000000..ae400b11b --- /dev/null +++ b/test/integration/rebase2/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":507,"Mod":0,"Key":259,"Ch":0},{"Timestamp":707,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1051,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1204,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1460,"Mod":0,"Key":256,"Ch":101},{"Timestamp":1948,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2091,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2828,"Mod":2,"Key":10,"Ch":10},{"Timestamp":4219,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4476,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5524,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6116,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6405,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6635,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7292,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8147,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8548,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8891,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9155,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9707,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10636,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebase2/setup.sh b/test/integration/rebase2/setup.sh new file mode 100644 index 000000000..864bf5ca9 --- /dev/null +++ b/test/integration/rebase2/setup.sh @@ -0,0 +1,32 @@ +#!/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 test3 > file4 +git add . +git commit -am file4-added + +echo test4 > file4 +git add . +git commit -am file4-changed + +echo test5 > file4 +git add . +git commit -am file4-changed-again diff --git a/test/integration/rebase2/test.json b/test/integration/rebase2/test.json new file mode 100644 index 000000000..e6d67fff1 --- /dev/null +++ b/test/integration/rebase2/test.json @@ -0,0 +1 @@ +{ "description": "rebasing by reordering two commits, causing a merge conflict", "speed": 10 } diff --git a/test/integration/rebase3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebase3/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..1595e626c --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,27 @@ +# This is a combination of 2 commits. +# This is the 1st commit message: + +file1 + +# This is the commit message #2: + +file2 + +# 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 11:43:21 2021 +1000 +# +# interactive rebase in progress; onto fdecf9e +# Last commands done (2 commands done): +# edit f06dfb4 file1 +# squash 51a0e4a file2 +# Next commands to do (3 remaining commands): +# edit d8ae31f file4-added +# fixup 4bf6ae4 file4-changed +# You are currently rebasing branch 'master' on 'fdecf9e'. +# +# Changes to be committed: +# new file: file1 +# new file: file2 +# diff --git a/test/integration/rebase3/expected/.git_keep/FETCH_HEAD b/test/integration/rebase3/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebase3/expected/.git_keep/HEAD b/test/integration/rebase3/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebase3/expected/.git_keep/ORIG_HEAD b/test/integration/rebase3/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..2409d6732 --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +9e68fbe4291e7416d50587d9b6968aa5ceeccff9 diff --git a/test/integration/rebase3/expected/.git_keep/config b/test/integration/rebase3/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebase3/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/rebase3/expected/.git_keep/description b/test/integration/rebase3/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebase3/expected/.git_keep/index b/test/integration/rebase3/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..efd9ed8a3066c6572f7b907b3a207a25e3b061e4 GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1p*I|a5FoPyDeKruGmhF1&>jY}997{3D5hyXF0g^1Oa1^=|R zy$e3{zH{l#M|-E5-eO=)%gjkN07^430QK)y-Vjm;qao%r=AoOjbkF0zs;M`=M1)51 zS!gH3#S?RDWGEIr<>{pV6_hSLrWKTYO21z4bZ-VvY&eoRA<_S0F=@ z!9>A;>kQ+5(FTXq$@*~tCY(%(-Zm^JJwhb!G8&)a?pTulc(tb80sWgxW)%Yfwo7w+ literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/info/exclude b/test/integration/rebase3/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/rebase3/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/rebase3/expected/.git_keep/logs/HEAD b/test/integration/rebase3/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..8f0d70d47 --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/logs/HEAD @@ -0,0 +1,12 @@ +0000000000000000000000000000000000000000 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI 1617673401 +1000 commit (initial): file0 +fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI 1617673401 +1000 commit: file1 +f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 51a0e4a6635c22a062a48b7134dd556541a1e06c CI 1617673401 +1000 commit: file2 +51a0e4a6635c22a062a48b7134dd556541a1e06c d8ae31faf375fd293cedb0c88c41a9c7a77a2530 CI 1617673401 +1000 commit: file4-added +d8ae31faf375fd293cedb0c88c41a9c7a77a2530 4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc CI 1617673401 +1000 commit: file4-changed +4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc 9e68fbe4291e7416d50587d9b6968aa5ceeccff9 CI 1617673401 +1000 commit: file4-changed-again +9e68fbe4291e7416d50587d9b6968aa5ceeccff9 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI 1617673403 +1000 rebase -i (start): checkout fdecf9e3e742db4c8690d56b328b2533e67d2866 +fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI 1617673403 +1000 rebase -i: fast-forward +f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 7b42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 CI 1617673407 +1000 rebase -i (squash): file1 +7b42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 8f2acebb8a7a83cfaf3cffc6a9103f633f5cf292 CI 1617673407 +1000 rebase -i (edit): file4-added +8f2acebb8a7a83cfaf3cffc6a9103f633f5cf292 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI 1617673409 +1000 rebase -i (fixup): file4-added +3c21f03d819ae34b74084712c3ef1b9b99b2f40e 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI 1617673409 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebase3/expected/.git_keep/logs/refs/heads/master b/test/integration/rebase3/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..b2e06daa1 --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI 1617673401 +1000 commit (initial): file0 +fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI 1617673401 +1000 commit: file1 +f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 51a0e4a6635c22a062a48b7134dd556541a1e06c CI 1617673401 +1000 commit: file2 +51a0e4a6635c22a062a48b7134dd556541a1e06c d8ae31faf375fd293cedb0c88c41a9c7a77a2530 CI 1617673401 +1000 commit: file4-added +d8ae31faf375fd293cedb0c88c41a9c7a77a2530 4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc CI 1617673401 +1000 commit: file4-changed +4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc 9e68fbe4291e7416d50587d9b6968aa5ceeccff9 CI 1617673401 +1000 commit: file4-changed-again +9e68fbe4291e7416d50587d9b6968aa5ceeccff9 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI 1617673409 +1000 rebase -i (finish): refs/heads/master onto fdecf9e3e742db4c8690d56b328b2533e67d2866 diff --git a/test/integration/rebase3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase3/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/rebase3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase3/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/rebase3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase3/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/rebase3/expected/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e b/test/integration/rebase3/expected/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e new file mode 100644 index 0000000000000000000000000000000000000000..5ddde579a193ba06199e95be990401da3187d85e GIT binary patch literal 154 zcmV;L0A>Gp0fmms3c@fD06pg`au;Pc?|_KVQ$J%j*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 hDKKHUpUta%rtH}p{!Gp0gaAJ3c@fDKwak)*^4rhPm_R%&{dByolI<@X-kRV@$C`ZJ|4WsTdi}` z2H?^T5zP!Z7W5GubUs;Aym+t<5||F%Xc-(Q7u8OOtWD=gVzE%M!Ix~3WyvFOjO>sS z2MU3Vx1i|LrtQ%EpdbD4k}uVLkvnhosj{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c b/test/integration/rebase3/expected/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c new file mode 100644 index 0000000000000000000000000000000000000000..3cae162a500d8fe4c0c6bd4311cc7140b09019e5 GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0@S6Lp1B3OVH&x~?=3n-DDY`OOo09fo0KYi;Qk zBVGETYNIlz07bYkl|rfJS{z{TS_3OG(~yP4?CH>Vw-tP;dDN&b#ZpsdA6*1+TuD$A zB~Yd$CVl#AJM1*u`!qlGo7%qWO}6&1=+Ar@MnHQ-05B&#r@H>Bo4Tw@<_9PHIP-ZK5Jj&!6B9CHEUECQjdxN!i6KIpGG?{MCeIFqC6^#p{D7Q>OfG01U9w0C zM{C7-MsiNYSAT2`rWvl&e3y5u`zn{b)f*Uh+yiob@`+FpRUTXicw#n J`T&TNJNMJFN(%r0 literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 b/test/integration/rebase3/expected/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 new file mode 100644 index 0000000000000000000000000000000000000000..60af8bec08e9fcaa9622909825eed90258c89a0a GIT binary patch literal 154 zcmV;L0A>Gp0fo*@3c@fDKw;N8MfRf1B$Gc75xVLzCdmW~tt};j$F~djZXe&`m33LB zt}(?^-$gW$IPk>e$i~*#iWg#NNJP#VF_==86x7DMyt)pVOy|n IzSr72*^Mbr;{X5v literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 b/test/integration/rebase3/expected/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 new file mode 100644 index 0000000000000000000000000000000000000000..f57e0bee5ce58bad1d68f7070c9fda0fdf343d35 GIT binary patch literal 158 zcmV;P0Ac@l0gcW}3c@fDfMM4;MfOt3hlEt9CqiZQ2)!$Q~%LSjdrbk|3_HrDVcd zQ>4%*B88v!+73O8`aXp9i%_Ig M3FlS)0NtrTT?xfeRsaA1 literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase3/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/rebase3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase3/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/rebase3/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebase3/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 new file mode 100644 index 0000000000000000000000000000000000000000..f390e4e4d3fe101fe8c866915505529f902e024f 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 hDKKHUWODRD_&=j#Wv|j-oVNIq6npD+2mpg5JH=58JZAs^ literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/rebase3/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/rebase3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebase3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 b/test/integration/rebase3/expected/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 new file mode 100644 index 0000000000000000000000000000000000000000..c24f2b41afc607c2609696ca89b27ce53f467aad GIT binary patch literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfRf1Bs0?%M1-z-jA=5#g0ZDU@c8x!Za;7F(^~7& zJP!S-?Pi|H7=)CVVqc0z6C;I!M8q5{;4sWKbZ*n#-pw;A96%&;3PC}FQa^VXDQ9M3 zLPY~fPCxCr?tYy7ZJZwV)w;dxn$~*vDA-9C3DBPr0NhcJsb+t2SC*I2MRT_7eh>>f ELF8LT*8l(j literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac b/test/integration/rebase3/expected/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac new file mode 100644 index 000000000..3f5ed1e60 --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac @@ -0,0 +1,4 @@ +xA + @Ѯ= etBV9# & =~sn?oekm`C +" +qRj!ugo͞}wEF% ޕeeLnn Rō&}k;`>Oz= ȣEDsseUk~Z9 \ No newline at end of file diff --git a/test/integration/rebase3/expected/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 b/test/integration/rebase3/expected/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 new file mode 100644 index 0000000000000000000000000000000000000000..ecf41f69272420a8ad21ada13ce8102ccf8c9f74 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{Nyo&1h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ01^yvK7|l+lDl^?3&4+5w6ION*Z>Wx*2G``w2j7zp5ye!9_x3-ZEp2N;>0^Y YC<|SMnax?xNyneulw}2*1KHUt;sfS7qW}N^ literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebase3/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 new file mode 100644 index 0000000000000000000000000000000000000000..f082bca50cf286002d22a8ec7fdbd56a3734044c 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 hDKKI1H_4Z}x=U01mLlh)SBpN~-`)0+9{^tJIj&$}J`Df> literal 0 HcmV?d00001 diff --git a/test/integration/rebase3/expected/.git_keep/refs/heads/master b/test/integration/rebase3/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..7946e55f6 --- /dev/null +++ b/test/integration/rebase3/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +3c21f03d819ae34b74084712c3ef1b9b99b2f40e diff --git a/test/integration/rebase3/expected/file0 b/test/integration/rebase3/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebase3/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebase3/expected/file1 b/test/integration/rebase3/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebase3/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebase3/expected/file2 b/test/integration/rebase3/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebase3/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebase3/expected/file4 b/test/integration/rebase3/expected/file4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/rebase3/expected/file4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/rebase3/recording.json b/test/integration/rebase3/recording.json new file mode 100644 index 000000000..85172e33b --- /dev/null +++ b/test/integration/rebase3/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":469,"Mod":0,"Key":259,"Ch":0},{"Timestamp":893,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1222,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1413,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1596,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1782,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2125,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2980,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3429,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3782,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4022,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4286,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4550,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4814,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5014,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5750,"Mod":0,"Key":256,"Ch":109},{"Timestamp":6221,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7254,"Mod":0,"Key":256,"Ch":109},{"Timestamp":7733,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8556,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebase3/setup.sh b/test/integration/rebase3/setup.sh new file mode 100644 index 000000000..864bf5ca9 --- /dev/null +++ b/test/integration/rebase3/setup.sh @@ -0,0 +1,32 @@ +#!/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 test3 > file4 +git add . +git commit -am file4-added + +echo test4 > file4 +git add . +git commit -am file4-changed + +echo test5 > file4 +git add . +git commit -am file4-changed-again diff --git a/test/integration/rebase3/test.json b/test/integration/rebase3/test.json new file mode 100644 index 000000000..fe5eca258 --- /dev/null +++ b/test/integration/rebase3/test.json @@ -0,0 +1 @@ +{ "description": "More interactive rebasing, with drop/fix/squash and edit commands", "speed": 10 } diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseFixupAndSquash/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..82d191bdf --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,24 @@ +# This is a combination of 2 commits. +# This is the 1st commit message: + +file4-changed + +# This is the commit message #2: + +file4-changed-again + +# 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 11:47:48 2021 +1000 +# +# interactive rebase in progress; onto 12ed10a +# Last commands done (2 commands done): +# pick 1d197a4 file4-changed +# squash 4dc7f31 file4-changed-again +# No commands remaining. +# You are currently rebasing branch 'master' on '12ed10a'. +# +# Changes to be committed: +# modified: file4 +# diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseFixupAndSquash/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/HEAD b/test/integration/rebaseFixupAndSquash/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseFixupAndSquash/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..0931f5d6f --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +7b01314ccdeccc57cee454feca6369237410e786 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/config b/test/integration/rebaseFixupAndSquash/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/.git_keep/description b/test/integration/rebaseFixupAndSquash/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/index b/test/integration/rebaseFixupAndSquash/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..8788e55ee1d4550f2879ac6ac8a94e8f783c6c7f GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1rRNBCF2aD~x~KruGmSzZhbjY}997{3D5hyXF0g^1Oa1^=|R zy$e3{zH{l#M|-E5-eO=)%gjkN07^43fbq2?r_o3nJ!Angv#}H=Daq-P{mw@JgX{b3r(an+I`C-(cwC~)@Rg1!_`deOU&$m#Am}3Mt zM@ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/info/exclude b/test/integration/rebaseFixupAndSquash/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/.git_keep/logs/HEAD b/test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..e0596fd20 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/HEAD @@ -0,0 +1,14 @@ +0000000000000000000000000000000000000000 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d CI 1617673668 +1000 commit (initial): file0 +0d633de5bd380e6b42e03ec1e7a055ba4f3c860d 7b01314ccdeccc57cee454feca6369237410e786 CI 1617673668 +1000 commit: file1 +7b01314ccdeccc57cee454feca6369237410e786 74d431c56eac1e359f6f5736978347af68af5702 CI 1617673668 +1000 commit: file2 +74d431c56eac1e359f6f5736978347af68af5702 12ed10a6439eadfdb8877e39b7c6547591a0a91c CI 1617673668 +1000 commit: file4-added +12ed10a6439eadfdb8877e39b7c6547591a0a91c 1d197a4c509a5e71bad9b0b439c8fd26323ff218 CI 1617673668 +1000 commit: file4-changed +1d197a4c509a5e71bad9b0b439c8fd26323ff218 4dc7f318f68fe1890dba6fb595009c4652c0a861 CI 1617673668 +1000 commit: file4-changed-again +4dc7f318f68fe1890dba6fb595009c4652c0a861 1d197a4c509a5e71bad9b0b439c8fd26323ff218 CI 1617673669 +1000 rebase -i (start): checkout 12ed10a6439eadfdb8877e39b7c6547591a0a91c +1d197a4c509a5e71bad9b0b439c8fd26323ff218 7679fc004a4a40da12907d72ccef14991976aaff CI 1617673669 +1000 rebase -i (squash): file4-changed +7679fc004a4a40da12907d72ccef14991976aaff 7679fc004a4a40da12907d72ccef14991976aaff CI 1617673669 +1000 rebase -i (finish): returning to refs/heads/master +7679fc004a4a40da12907d72ccef14991976aaff 7b01314ccdeccc57cee454feca6369237410e786 CI 1617673671 +1000 rebase -i (start): checkout 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d +7b01314ccdeccc57cee454feca6369237410e786 dbab7e62cd7517f73425d46120a931a59c8eda6e CI 1617673671 +1000 rebase -i (fixup): file1 +dbab7e62cd7517f73425d46120a931a59c8eda6e 4ae4346ad59bf70d5ba07184af5a138b6a65c224 CI 1617673671 +1000 rebase -i (pick): file4-added +4ae4346ad59bf70d5ba07184af5a138b6a65c224 8adb7457de59c3945566ce7675a31bbf048b38ee CI 1617673671 +1000 rebase -i (pick): file4-changed +8adb7457de59c3945566ce7675a31bbf048b38ee 8adb7457de59c3945566ce7675a31bbf048b38ee CI 1617673671 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..787b78287 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,8 @@ +0000000000000000000000000000000000000000 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d CI 1617673668 +1000 commit (initial): file0 +0d633de5bd380e6b42e03ec1e7a055ba4f3c860d 7b01314ccdeccc57cee454feca6369237410e786 CI 1617673668 +1000 commit: file1 +7b01314ccdeccc57cee454feca6369237410e786 74d431c56eac1e359f6f5736978347af68af5702 CI 1617673668 +1000 commit: file2 +74d431c56eac1e359f6f5736978347af68af5702 12ed10a6439eadfdb8877e39b7c6547591a0a91c CI 1617673668 +1000 commit: file4-added +12ed10a6439eadfdb8877e39b7c6547591a0a91c 1d197a4c509a5e71bad9b0b439c8fd26323ff218 CI 1617673668 +1000 commit: file4-changed +1d197a4c509a5e71bad9b0b439c8fd26323ff218 4dc7f318f68fe1890dba6fb595009c4652c0a861 CI 1617673668 +1000 commit: file4-changed-again +4dc7f318f68fe1890dba6fb595009c4652c0a861 7679fc004a4a40da12907d72ccef14991976aaff CI 1617673669 +1000 rebase -i (finish): refs/heads/master onto 12ed10a6439eadfdb8877e39b7c6547591a0a91c +7679fc004a4a40da12907d72ccef14991976aaff 8adb7457de59c3945566ce7675a31bbf048b38ee CI 1617673671 +1000 rebase -i (finish): refs/heads/master onto 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d new file mode 100644 index 0000000000000000000000000000000000000000..b3ad40df8f9e52eb0b028d0e44b6dc8c50b2cd70 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDKvCB@#q0%{NykYCM1-z-jHH=hp&_M2@c8x!Za)wH(rR5h z5c8!UW-!B04w81Tj7(dUbG>T1bwB6Nq)OP;uT;^ueO% zLV?FNlj2W*?M=^%zRk-+zFdz@u4%7#4FsM>LqVUx7^4Oqr@H*9tFmr_7tUF-`T;a0 FI+jPjL$v?^ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 new file mode 100644 index 0000000000000000000000000000000000000000..67d18fdbada6ed0dc4d69b6cbb999ab2ff4c8c3d GIT binary patch literal 153 zcmV;K0A~Mq0gcX03c@fDKw;N8MfRf1kF79W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 new file mode 100644 index 0000000000000000000000000000000000000000..39b5247e9c4f795126961919183ac72602b03cfa 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 hDKKHUpUta%rtH}p{!M zqP@|ESwj%`Y4d){VU*8deA5@}vC<>&^(DbW?|b8Ykati@iK|{yjsE0{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 new file mode 100644 index 000000000..5c7753460 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 @@ -0,0 +1,3 @@ +x +0{W^($fW(ψ*hI_?aFu_"]Q)KNt8D|ԫw<9 +U Tcb+4z8K2^aއo^7ևt9$J9ssOy7?:= \ No newline at end of file diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/76/79fc004a4a40da12907d72ccef14991976aaff b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/76/79fc004a4a40da12907d72ccef14991976aaff new file mode 100644 index 0000000000000000000000000000000000000000..558848f2f8bb6a5c496bfb2c044b9564ee41e5c6 GIT binary patch literal 164 zcmV;V09*ff0fmmc3WG2dKs)CvvKLEk-homIPJYHsa-)J#krev*b?DNm<2jt+q^;Ju zaVg=_4kBKPD$&Y}CCQSrNFFF#9TO-SjWS-7At1?iJZNnkBxMk2wF-o};uD STt~|67dsqrUfBmeu0&cp+)MQU literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/7b/01314ccdeccc57cee454feca6369237410e786 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/7b/01314ccdeccc57cee454feca6369237410e786 new file mode 100644 index 0000000000000000000000000000000000000000..22dacc53ad2bd766633d581fecd79fa3483d6ad3 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3d0}}K+&!}h5JGo9UUW-QphUD7{`$Yk|qQTJ$`e9Za;7FWn0&| zTbKQ%AF8%OB9SZtnT6R`q*f$xj;*441PVD&aAxO2-`zqb#Hz7W96+fAuYf8}6GM!J zLqiz|s^L$6ZHFBvdmpE#etF#&y~(ydtRt5wA<O# zbCX)bsqM_N6jLJVOeN`(vq}Ltqm2oSj?TDX*)gyd8|}O_X^E||NZDOu@hZDW%0sYJ z9DxZD30>0K3VO9^-DN+>TR%MbO?7+nC9U-?0l}j;h(Vq~DJ2ejOf~+Wd-&#}%ulvm TnrIn0i(l+$q=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 new file mode 100644 index 0000000000000000000000000000000000000000..f390e4e4d3fe101fe8c866915505529f902e024f 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 hDKKHUWODRD_&=j#Wv|j-oVNIq6npD+2mpg5JH=58JZAs^ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/db/ab7e62cd7517f73425d46120a931a59c8eda6e b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/db/ab7e62cd7517f73425d46120a931a59c8eda6e new file mode 100644 index 0000000000000000000000000000000000000000..14cf07cf85fcc7142fa5a695809b7389b0806cb5 GIT binary patch literal 150 zcmV;H0BQet0ey}^3c@fD06pgwdlzIkX_6I0gr540B)h>vV@rwP^X%i`mkyuMQ}|IZ>a*F>1(zRdiZNV?yt9 z8mcQCP)vIF=eolbxkKFYp*T EQyQa5p8x;= literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 new file mode 100644 index 0000000000000000000000000000000000000000..f082bca50cf286002d22a8ec7fdbd56a3734044c 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 hDKKI1H_4Z}x=U01mLlh)SBpN~-`)0+9{^tJIj&$}J`Df> literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/refs/heads/master b/test/integration/rebaseFixupAndSquash/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..d711bd628 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +8adb7457de59c3945566ce7675a31bbf048b38ee diff --git a/test/integration/rebaseFixupAndSquash/expected/file0 b/test/integration/rebaseFixupAndSquash/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebaseFixupAndSquash/expected/file1 b/test/integration/rebaseFixupAndSquash/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebaseFixupAndSquash/expected/file2 b/test/integration/rebaseFixupAndSquash/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebaseFixupAndSquash/expected/file4 b/test/integration/rebaseFixupAndSquash/expected/file4 new file mode 100644 index 000000000..4f346f1ad --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/expected/file4 @@ -0,0 +1 @@ +test5 diff --git a/test/integration/rebaseFixupAndSquash/recording.json b/test/integration/rebaseFixupAndSquash/recording.json new file mode 100644 index 000000000..9c80dbcae --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":596,"Mod":0,"Key":259,"Ch":0},{"Timestamp":853,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1157,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1469,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1998,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2293,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2645,"Mod":0,"Key":256,"Ch":102},{"Timestamp":2941,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3570,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseFixupAndSquash/setup.sh b/test/integration/rebaseFixupAndSquash/setup.sh new file mode 100644 index 000000000..864bf5ca9 --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/setup.sh @@ -0,0 +1,32 @@ +#!/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 test3 > file4 +git add . +git commit -am file4-added + +echo test4 > file4 +git add . +git commit -am file4-changed + +echo test5 > file4 +git add . +git commit -am file4-changed-again diff --git a/test/integration/rebaseFixupAndSquash/test.json b/test/integration/rebaseFixupAndSquash/test.json new file mode 100644 index 000000000..62c84c89a --- /dev/null +++ b/test/integration/rebaseFixupAndSquash/test.json @@ -0,0 +1 @@ +{ "description": "Directly invoking a fixup and a squash", "speed": 10 } diff --git a/test/integration/rebaseFixups/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseFixups/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..7c10b820b --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +fixup! file4-added diff --git a/test/integration/rebaseFixups/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseFixups/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebaseFixups/expected/.git_keep/HEAD b/test/integration/rebaseFixups/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebaseFixups/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseFixups/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..b2314b936 --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ace527b9737b6c554963361f50ce98a0509c2344 diff --git a/test/integration/rebaseFixups/expected/.git_keep/config b/test/integration/rebaseFixups/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebaseFixups/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/rebaseFixups/expected/.git_keep/description b/test/integration/rebaseFixups/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebaseFixups/expected/.git_keep/index b/test/integration/rebaseFixups/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..b0c222619bd9c817d8efa673f73ae08fec1fe667 GIT binary patch literal 497 zcmZ?q402{*U|<4bwuJ0`6GZpF6@<}@3=Ax6y7S{17#f!_Ffe`vsu2OHvkB29SQSyBot{G}N3jbaR&OdHh#3^~RTo&?ugK zrwajIE!|fk<`}}w5&yCaY#xY)n$wPMjs(vSqXwmY=U%Q_6kgTe@=ANYg*wC>BbYhU zHC}f90lEiFL(Ey=f^Lq#Nxsz8U7F&z6geNgTJ-7u?zWHo5OYir=B#+44>ku#L(MTo zH>Y{RVePn#>gkW1Zn=4OhkKplliLb02dESXK>F1`^Y4JsP;&&)&3U|*<=|hNiRK%E z-fU574G8++a-$z&jv3gTkRVrAAVZSDOu>NbqFtC}lUi@r_Npu8lNW7ey#H*$o$#yw Wy%OHcYFwo9ZbB4~Zs%nE#sdKOJExcc literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/info/exclude b/test/integration/rebaseFixups/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/rebaseFixups/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/rebaseFixups/expected/.git_keep/logs/HEAD b/test/integration/rebaseFixups/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..939752164 --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/logs/HEAD @@ -0,0 +1,14 @@ +0000000000000000000000000000000000000000 b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 CI 1617673872 +1000 commit (initial): file0 +b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 69ebe8bf01f728a9bc787e8553694e36127b48c0 CI 1617673872 +1000 commit: file1 +69ebe8bf01f728a9bc787e8553694e36127b48c0 1d7ab21ab5322589052cf9d2d62ca58677f454cc CI 1617673872 +1000 commit: file2 +1d7ab21ab5322589052cf9d2d62ca58677f454cc 331be377b5889b19b5900bc4bed98b1c9cc40095 CI 1617673872 +1000 commit: file4-added +331be377b5889b19b5900bc4bed98b1c9cc40095 ace527b9737b6c554963361f50ce98a0509c2344 CI 1617673872 +1000 commit: file4-changed +ace527b9737b6c554963361f50ce98a0509c2344 77741cf500de50347e9f4e5a091515e4568ddad3 CI 1617673872 +1000 commit: file4-changed-again +77741cf500de50347e9f4e5a091515e4568ddad3 dcbade3308277dabb66de476c1cce03bd840d22a CI 1617673875 +1000 commit: fixup! file4-changed +dcbade3308277dabb66de476c1cce03bd840d22a 1056fd624d61daad06a8726c0ea5626820cafe59 CI 1617673877 +1000 commit: fixup! file4-added +1056fd624d61daad06a8726c0ea5626820cafe59 331be377b5889b19b5900bc4bed98b1c9cc40095 CI 1617673879 +1000 rebase -i (start): checkout 69ebe8bf01f728a9bc787e8553694e36127b48c0^ +331be377b5889b19b5900bc4bed98b1c9cc40095 30a685cfa43930aadd5b56b2ec0746564d1a1d22 CI 1617673879 +1000 rebase -i (fixup): file4-added +30a685cfa43930aadd5b56b2ec0746564d1a1d22 2bd4d58d29b60b5868c19437ff4467d84ed270aa CI 1617673879 +1000 rebase -i (pick): file4-changed +2bd4d58d29b60b5868c19437ff4467d84ed270aa 4d7b35df7f8ced30495fc0f62b91a270bad7076b CI 1617673879 +1000 rebase -i (fixup): file4-changed +4d7b35df7f8ced30495fc0f62b91a270bad7076b c8738908c85292494dba61be9c050ad95ff0e182 CI 1617673879 +1000 rebase -i (pick): file4-changed-again +c8738908c85292494dba61be9c050ad95ff0e182 c8738908c85292494dba61be9c050ad95ff0e182 CI 1617673879 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseFixups/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseFixups/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..43ff8c639 --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 CI 1617673872 +1000 commit (initial): file0 +b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 69ebe8bf01f728a9bc787e8553694e36127b48c0 CI 1617673872 +1000 commit: file1 +69ebe8bf01f728a9bc787e8553694e36127b48c0 1d7ab21ab5322589052cf9d2d62ca58677f454cc CI 1617673872 +1000 commit: file2 +1d7ab21ab5322589052cf9d2d62ca58677f454cc 331be377b5889b19b5900bc4bed98b1c9cc40095 CI 1617673872 +1000 commit: file4-added +331be377b5889b19b5900bc4bed98b1c9cc40095 ace527b9737b6c554963361f50ce98a0509c2344 CI 1617673872 +1000 commit: file4-changed +ace527b9737b6c554963361f50ce98a0509c2344 77741cf500de50347e9f4e5a091515e4568ddad3 CI 1617673872 +1000 commit: file4-changed-again +77741cf500de50347e9f4e5a091515e4568ddad3 dcbade3308277dabb66de476c1cce03bd840d22a CI 1617673875 +1000 commit: fixup! file4-changed +dcbade3308277dabb66de476c1cce03bd840d22a 1056fd624d61daad06a8726c0ea5626820cafe59 CI 1617673877 +1000 commit: fixup! file4-added +1056fd624d61daad06a8726c0ea5626820cafe59 c8738908c85292494dba61be9c050ad95ff0e182 CI 1617673879 +1000 rebase -i (finish): refs/heads/master onto b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 b/test/integration/rebaseFixups/expected/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 new file mode 100644 index 000000000..83047c02c --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 @@ -0,0 +1,2 @@ +xA +0@Ѯs麴LD(cL2#LK)Sn k| Q"'"RVF ʛ~+HN,=FG$R lsVIbg٠o=>R^`@>"99UOn+Ӭ͝ET޺> \ No newline at end of file diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseFixups/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/rebaseFixups/expected/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc b/test/integration/rebaseFixups/expected/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc new file mode 100644 index 000000000..6fa0dda1b --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc @@ -0,0 +1,3 @@ +xK +0@]d2i31`Dn[kKU*K"T +ŚjѲʢV\ʔ}wAJh+Đ2 aP-q$fOS`g'LphNzNuS7uY9 \ No newline at end of file diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseFixups/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/rebaseFixups/expected/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 b/test/integration/rebaseFixups/expected/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 new file mode 100644 index 0000000000000000000000000000000000000000..f4470cb279c7a0c4f02f88c8c0c3a3dad93cea08 GIT binary patch literal 152 zcmV;J0B8Sr0V^p=O;s>7Gi5L|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F zDKKI1H_4Z}x=U01mLlh)SBpN~-`)0+A4!2JL-T~g+Ho1x(;qqAa`WsC_d3TXw-o@4 GszwW0dDK&ZI;M;>)q!}6-oMwoD z8VZ7p;+)}koz~rUy}fn)LqA-$mtON)?iL9nMW3RxX9NIq*kh{dpS=C$W}IIdE_veR Ksbaq3wL8{f=1L?0 literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 b/test/integration/rebaseFixups/expected/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 new file mode 100644 index 0000000000000000000000000000000000000000..e59fd9ab61319f57610af1bbafc346db5e132cab GIT binary patch literal 154 zcmV;L0A>Gp0fml13c@fD06pgwxr>r)lWYPaLQj3hW_N>y)|OJi=i7sKufq%sFY`R^ z)|Y(RH&x5op)|oj!d`vF4je?L8WOjdY7k#K#b8$2^mT-SRKZh?9YD;*Mc`HhBmq;* z39*G3m<_%6=d#&;u(y7A=!fQY(kn0X-TLG)VV4o?**oXVL650j|LEnXn>J1wE+nF2 IzVC)Ry9$L(2mk;8 literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 b/test/integration/rebaseFixups/expected/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 new file mode 100644 index 0000000000000000000000000000000000000000..fcbf9a75b747728e9995bb74e7ad2b34f1addd1c GIT binary patch literal 152 zcmV;J0B8Sr0gaAL3c@fDMqTF=*^81)X7U3fLRUS;G?`$**is^Rd~*c1AMZWBytTG= zZBsn;LqsDA8IO#FF4oFUydaxu5s?T4Y)XrypmsjwJ;V}t0m}F|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseFixups/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 new file mode 100644 index 0000000000000000000000000000000000000000..39b5247e9c4f795126961919183ac72602b03cfa 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 hDKKHUpUta%rtH}p{!5#SR4hWmgyNaTlIx LeM(YatN}dy+;2)X literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebaseFixups/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f new file mode 100644 index 0000000000000000000000000000000000000000..953241815cfa19b4d357807bedcbb2277b2e3ba8 GIT binary patch literal 21 ccmb{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 b/test/integration/rebaseFixups/expected/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 new file mode 100644 index 0000000000000000000000000000000000000000..5b85e230c3ad50eb145059ebde02b48c8808719e GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSB{w4{C2wn9U$z%o#jV&dD$G1mt`}h`*w%(Va zO}3YDFzW^pi82x7LZ#T|P%6cegEYt10s8FG8?~2%-$U0#zM)N#g(@a$BDD|zlL;bZ zgM=7}f-0Z!+73O<`aaE1{+7P4e50*Dv_TUwx)iOx8URpdJ*Ni$$(1ZC8}$QDCp#I^ Cr$bZ# literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 b/test/integration/rebaseFixups/expected/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 new file mode 100644 index 0000000000000000000000000000000000000000..459addc0f782c096aff8e3a2654bbcfe8f9502b8 GIT binary patch literal 158 zcmV;P0Ac@l0gcX03WG2ZK;f=)itLMJ@^7G&f-8?PnM_nLDw0BvUyso3<6Au1Yh9Yu z;BW0@mZg}Iyv|rimz;rm#o60L%IM^b>n%H0ti^#RZ%rbx(;>xRLh|ICjouiqiUZ=< zBRGhpjkN+lZQf5gjPf~*Z~kIER({Z4Us8D$d@y~`@~!|tT=kl2{3jP>S=n|p<2G^b MaKdF1KLzAIxgOF_?f?J) literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 b/test/integration/rebaseFixups/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 new file mode 100644 index 0000000000000000000000000000000000000000..be495f3991a70f570da18905f0d6f17de4d85e73 GIT binary patch literal 21 ccmb=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseFixups/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/rebaseFixups/expected/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 b/test/integration/rebaseFixups/expected/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 new file mode 100644 index 0000000000000000000000000000000000000000..4ac2c9b907bfdb849d27522420dd9906d40b6eb1 GIT binary patch literal 153 zcmV;K0A~Mq0gcW}3c^4PfMM5jirI^jbe;hbp{pKalBTxM7i9#GZ;#;i=Ue=;Ez4AG z18}K_sucm`0Ye54F_3G9paGl*f+nJ8C*XyAHhVdAt=2hYbt!SknHY%!0kC-1o-(75 zhzFox%BPOoVcX6=+U}*_vh1_oWm}#WBc_;KPK~`H0GP9$Q&s=uW|(I6HyO+N*53R8 HPTV^AQ$rapIjH ZMsMjV%xunjPCEYNrmP#-`~cmPEBc?jIr#tp literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 b/test/integration/rebaseFixups/expected/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 new file mode 100644 index 000000000..71d98204d --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 @@ -0,0 +1,2 @@ +x+)JMU0`040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W1H0jPwEU-[#)0adrA?ce_{uS 2?ruOn+3kYh!ր.7CV7 \ No newline at end of file diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 b/test/integration/rebaseFixups/expected/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 new file mode 100644 index 0000000000000000000000000000000000000000..06a7c314983bdc6272f2b79d98c2e5055dfd1073 GIT binary patch literal 152 zcmV;J0B8Sr0V^p=O;s>7Gi5L|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F zDKKHUpUta%rtH}p{!W%{K(S*`m}M5cI+2Mn3>< GUPd_jm`KzB literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 b/test/integration/rebaseFixups/expected/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 new file mode 100644 index 0000000000000000000000000000000000000000..96f65d24b2ef2ed53f630cba06e6193415aaa7a4 GIT binary patch literal 162 zcmV;T0A2rh0fo*z3d1lAK;h0lh4+#o+lggEDTPcuhHS}6Ab$iGdi-YS-u3YfFK^2- zRc*mv>LH@pIO)8L!CD_UP(mbb5u+oUIxt+s6L3~L9kN#4GA7q?!4k5tgEn?0L-966 zLlz+sBcM-;-gVp#-M{p`e?8?x%Rb93Z_7g)Z_uL)X!X?qfI90rRpk$lKd#C&OWWj; Q)b`0o)xv^+hC05C8xG literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseFixups/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 new file mode 100644 index 0000000000000000000000000000000000000000..f390e4e4d3fe101fe8c866915505529f902e024f 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 hDKKHUWODRD_&=j#Wv|j-oVNIq6npD+2mpg5JH=58JZAs^ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseFixups/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/rebaseFixups/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/rebaseFixups/expected/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc b/test/integration/rebaseFixups/expected/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc new file mode 100644 index 0000000000000000000000000000000000000000..f7f6b9e6008377397477466e7fe93b42416dd26f GIT binary patch literal 177 zcmV;i08amS0V^p=O;s?ov|unaFfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F zDKKI1H_4Z}x=U01mLlh)SBpN~-`)0+A4!2JL-T~g+Ho1x(;qqAa`WsC_d3TXw-rf& f8N=hXEC>JEOf=sR^k$1vYe3KkmmB>6V+>Rvz9d%J literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebaseFixups/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a b/test/integration/rebaseFixups/expected/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a new file mode 100644 index 0000000000000000000000000000000000000000..74b7026b45be5a74781d9d6fe991d4b837ac4d5e GIT binary patch literal 159 zcmV;Q0AT-k0gcX03WG2ZK;f=)igaCCCcl$FDFs&^W138=U{oZ6$FE1|_VF!VT527e z)PR?^F-uKeBU+@W6NjYH7R&`Q8Ka|DzWDfw!FjRL#&eT+VwH*m$n3ya2ji63dHFR8pjk0zj#Hw6IVtmjnYKe;I5v9DKI#)<7c N4K#l_iyvi{J^}xEO3?rS literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseFixups/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f b/test/integration/rebaseFixups/expected/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f new file mode 100644 index 0000000000000000000000000000000000000000..371c28d7917669af8bb4ec4c3028fb1e235d818d GIT binary patch literal 21 ccmb_z7908p?8S^xk5 literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseFixups/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 new file mode 100644 index 0000000000000000000000000000000000000000..f082bca50cf286002d22a8ec7fdbd56a3734044c 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 hDKKI1H_4Z}x=U01mLlh)SBpN~-`)0+9{^tJIj&$}J`Df> literal 0 HcmV?d00001 diff --git a/test/integration/rebaseFixups/expected/.git_keep/refs/heads/master b/test/integration/rebaseFixups/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..883b23a0e --- /dev/null +++ b/test/integration/rebaseFixups/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +c8738908c85292494dba61be9c050ad95ff0e182 diff --git a/test/integration/rebaseFixups/expected/file0 b/test/integration/rebaseFixups/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebaseFixups/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebaseFixups/expected/file1 b/test/integration/rebaseFixups/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebaseFixups/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebaseFixups/expected/file2 b/test/integration/rebaseFixups/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebaseFixups/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebaseFixups/expected/file4 b/test/integration/rebaseFixups/expected/file4 new file mode 100644 index 000000000..4f346f1ad --- /dev/null +++ b/test/integration/rebaseFixups/expected/file4 @@ -0,0 +1 @@ +test5 diff --git a/test/integration/rebaseFixups/expected/file5 b/test/integration/rebaseFixups/expected/file5 new file mode 100644 index 000000000..8390c32b5 --- /dev/null +++ b/test/integration/rebaseFixups/expected/file5 @@ -0,0 +1 @@ +test6 diff --git a/test/integration/rebaseFixups/expected/file6 b/test/integration/rebaseFixups/expected/file6 new file mode 100644 index 000000000..e3ad04c1f --- /dev/null +++ b/test/integration/rebaseFixups/expected/file6 @@ -0,0 +1 @@ +test7 diff --git a/test/integration/rebaseFixups/recording.json b/test/integration/rebaseFixups/recording.json new file mode 100644 index 000000000..7e9e1aace --- /dev/null +++ b/test/integration/rebaseFixups/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1148,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1469,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1716,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2133,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2860,"Mod":0,"Key":256,"Ch":70},{"Timestamp":3205,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3645,"Mod":0,"Key":260,"Ch":0},{"Timestamp":3797,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4053,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4316,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4469,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4765,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4901,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5164,"Mod":0,"Key":256,"Ch":70},{"Timestamp":5468,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5868,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6061,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6349,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6644,"Mod":0,"Key":256,"Ch":83},{"Timestamp":7108,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7924,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseFixups/setup.sh b/test/integration/rebaseFixups/setup.sh new file mode 100644 index 000000000..84c2fab8d --- /dev/null +++ b/test/integration/rebaseFixups/setup.sh @@ -0,0 +1,35 @@ +#!/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 test3 > file4 +git add . +git commit -am file4-added + +echo test4 > file4 +git add . +git commit -am file4-changed + +echo test5 > file4 +git add . +git commit -am file4-changed-again + +echo test6 > file5 +echo test7 > file6 diff --git a/test/integration/rebaseFixups/test.json b/test/integration/rebaseFixups/test.json new file mode 100644 index 000000000..bf4a43f42 --- /dev/null +++ b/test/integration/rebaseFixups/test.json @@ -0,0 +1 @@ +{ "description": "Squashing all above fixup commits", "speed": 10 } diff --git a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/rebaseReword/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseReword/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebaseReword/expected/.git_keep/HEAD b/test/integration/rebaseReword/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebaseReword/expected/.git_keep/config b/test/integration/rebaseReword/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebaseReword/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/rebaseReword/expected/.git_keep/description b/test/integration/rebaseReword/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebaseReword/expected/.git_keep/index b/test/integration/rebaseReword/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..a25ab61cc96986d31c5c1837ef7242f500f569c2 GIT binary patch literal 281 zcmZ?q402{*U|<4b=7jA18cfR;sKIDP1_l;3-K94e7#f!_Ffe`vsu2NVHVYA}D+~T< zZF?7d=zZtXn~(NRHNC~anwFW9Y5fO4qrk>L4Z)S$HQ+{;yq!mIjQUTM#_P=}af z1U4rm$ki3dkYq4cFyNZkv7GnB4c$xY_g`f!dtdReLwS#m{@ 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 diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..fc84f04f9 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master @@ -0,0 +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 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 b/test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 new file mode 100644 index 0000000000000000000000000000000000000000..112af2af6f8cce3a35ce2f5c737e80325a826476 GIT binary patch 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~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseReword/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/rebaseReword/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseReword/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/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d b/test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d new file mode 100644 index 000000000..f44664ac8 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d @@ -0,0 +1,3 @@ +xK +1] : "jIwP00FfmQxem5$8]D'!p!&d\@ R# ] +]#5KbHєlޡprV@*m44_SYECt58N?]uyu$9 \ No newline at end of file diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf b/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf new file mode 100644 index 000000000..bfcd244a3 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf @@ -0,0 +1,3 @@ +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/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseReword/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/rebaseReword/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseReword/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/rebaseReword/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseReword/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/rebaseReword/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/rebaseReword/expected/.git_keep/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..d123c9d33 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +4a225f57a7e50ba304defb8db41d9736dd85613d diff --git a/test/integration/rebaseReword/expected/file0 b/test/integration/rebaseReword/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebaseReword/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebaseReword/expected/file1 b/test/integration/rebaseReword/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebaseReword/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebaseReword/expected/file2 b/test/integration/rebaseReword/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebaseReword/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebaseReword/recording.json b/test/integration/rebaseReword/recording.json new file mode 100644 index 000000000..54095b121 --- /dev/null +++ b/test/integration/rebaseReword/recording.json @@ -0,0 +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 diff --git a/test/integration/rebaseReword/setup.sh b/test/integration/rebaseReword/setup.sh new file mode 100644 index 000000000..9b9e01321 --- /dev/null +++ b/test/integration/rebaseReword/setup.sh @@ -0,0 +1,20 @@ +#!/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 diff --git a/test/integration/rebaseReword/test.json b/test/integration/rebaseReword/test.json new file mode 100644 index 000000000..a1391f372 --- /dev/null +++ b/test/integration/rebaseReword/test.json @@ -0,0 +1 @@ +{ "description": "Rewording top commit", "speed": 20 } diff --git a/test/integration/rebaseSwapping/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseSwapping/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..a154d4e80 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,15 @@ +file4-changed + +# 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 613c1bf +# Last commands done (2 commands done): +# pick 0e45fe2 file4-changed-again +# pick ceada38 file4-changed +# No commands remaining. +# You are currently rebasing branch 'master' on '613c1bf'. +# +# Changes to be committed: +# modified: file4 +# diff --git a/test/integration/rebaseSwapping/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseSwapping/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebaseSwapping/expected/.git_keep/HEAD b/test/integration/rebaseSwapping/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebaseSwapping/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseSwapping/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..7b6e3c529 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ceada384bff8df54abb8acbf497b751aa9220f00 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/REBASE_HEAD b/test/integration/rebaseSwapping/expected/.git_keep/REBASE_HEAD new file mode 100644 index 000000000..7b6e3c529 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/REBASE_HEAD @@ -0,0 +1 @@ +ceada384bff8df54abb8acbf497b751aa9220f00 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/config b/test/integration/rebaseSwapping/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebaseSwapping/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/rebaseSwapping/expected/.git_keep/description b/test/integration/rebaseSwapping/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebaseSwapping/expected/.git_keep/index b/test/integration/rebaseSwapping/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..927d6bdde34155ff1151938d466b74824c468f32 GIT binary patch literal 448 zcmZ?q402{*U|<4bmW1rRI;;wwJ5x*zvY$od<%7mIYuyZ zjHEO6-UpfkrlICcMmOh@$fx&j%J3?>Q& zTxS^fi#9l 1617673516 +1000 commit (initial): file0 +ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b218d34eec545f29156411f24ab609b970082e1c CI 1617673516 +1000 commit: file1 +b218d34eec545f29156411f24ab609b970082e1c d23bcf26566cbf601e766d12ea206cb7827d6630 CI 1617673516 +1000 commit: file2 +d23bcf26566cbf601e766d12ea206cb7827d6630 613c1bfa180babe5e67317d1ef42d566718a7d8f CI 1617673516 +1000 commit: file4-added +613c1bfa180babe5e67317d1ef42d566718a7d8f ceada384bff8df54abb8acbf497b751aa9220f00 CI 1617673516 +1000 commit: file4-changed +ceada384bff8df54abb8acbf497b751aa9220f00 0e45fe2fb8b21adfe348ec5419bd87e4c796c02a CI 1617673516 +1000 commit: file4-changed-again +0e45fe2fb8b21adfe348ec5419bd87e4c796c02a 613c1bfa180babe5e67317d1ef42d566718a7d8f CI 1617673517 +1000 rebase -i (start): checkout 613c1bfa180babe5e67317d1ef42d566718a7d8f +613c1bfa180babe5e67317d1ef42d566718a7d8f 84c7a918e6bd704aaf4f789ecaea479ab31d4741 CI 1617673520 +1000 rebase -i (continue): file4-changed-again +84c7a918e6bd704aaf4f789ecaea479ab31d4741 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI 1617673523 +1000 rebase -i (continue): file4-changed +41eefd8a741d391640c4e0528e0b6fff31f90a18 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI 1617673523 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseSwapping/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseSwapping/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..0f69be051 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 CI 1617673516 +1000 commit (initial): file0 +ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b218d34eec545f29156411f24ab609b970082e1c CI 1617673516 +1000 commit: file1 +b218d34eec545f29156411f24ab609b970082e1c d23bcf26566cbf601e766d12ea206cb7827d6630 CI 1617673516 +1000 commit: file2 +d23bcf26566cbf601e766d12ea206cb7827d6630 613c1bfa180babe5e67317d1ef42d566718a7d8f CI 1617673516 +1000 commit: file4-added +613c1bfa180babe5e67317d1ef42d566718a7d8f ceada384bff8df54abb8acbf497b751aa9220f00 CI 1617673516 +1000 commit: file4-changed +ceada384bff8df54abb8acbf497b751aa9220f00 0e45fe2fb8b21adfe348ec5419bd87e4c796c02a CI 1617673516 +1000 commit: file4-changed-again +0e45fe2fb8b21adfe348ec5419bd87e4c796c02a 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI 1617673523 +1000 rebase -i (finish): refs/heads/master onto 613c1bfa180babe5e67317d1ef42d566718a7d8f diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a b/test/integration/rebaseSwapping/expected/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a new file mode 100644 index 000000000..4f88bafe1 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a @@ -0,0 +1,2 @@ +xM +0@s%+1IfT0*B_[׺4H2N^䬹#P6e0:9%G@Zxd&,hM̱RĜ!֊i~aa|#%C8W/+.ϸMT:p@{ \ No newline at end of file diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseSwapping/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/rebaseSwapping/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseSwapping/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/rebaseSwapping/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseSwapping/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/rebaseSwapping/expected/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 b/test/integration/rebaseSwapping/expected/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 new file mode 100644 index 0000000000000000000000000000000000000000..5aece5fd774855f8470de22b757ea0b544409d07 GIT binary patch literal 157 zcmV;O0Al}m0e#N93c^4TKvC=citR<2$m`1z)=w!NI<$~wr!nZiJUQM=!XczT&Tp9Ralu~ z=HB5zkNmtJL^?-m2b5S_*|GaTOZp!phy2!}O LQwQ?}oK8D~7y45b literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseSwapping/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 new file mode 100644 index 0000000000000000000000000000000000000000..39b5247e9c4f795126961919183ac72602b03cfa 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 hDKKHUpUta%rtH}p{!{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 b/test/integration/rebaseSwapping/expected/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 new file mode 100644 index 0000000000000000000000000000000000000000..4e81f29f610fffe007f6e72c2132a7fc04569c12 GIT binary patch literal 65 zcmV-H0KWft0ZYosPf{>5W3Yh$1rJw87p{`j;u2FXTL=L2Ot|bIKp{CbF(uL1LQhXm XAuTf})kHTrBQY;MHH8ZR-=7p{0UQ=p literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f b/test/integration/rebaseSwapping/expected/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f new file mode 100644 index 0000000000000000000000000000000000000000..3710de84b6ba522aa9de2750aabcef59cdaf5b53 GIT binary patch literal 151 zcmV;I0BHYs0gcW<3c@fDKvCB@MfRf1B$G)4B0^U^#x$8=!PrtFczk;Vw~xR0d2Ma! z7SnL*yQ(G908B!G{7|cSWhH@%L==KkhbhgPqS<8Ecelm)IakMlInR{=H8K};Dh>{b zgNudPgON{vuDcy4dmE>Rex+?Mz2>#uEiy)qJ|NpO0)RR6nCkjxZtC(vn3MjZeE literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 b/test/integration/rebaseSwapping/expected/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 new file mode 100644 index 0000000000000000000000000000000000000000..947ad09af3ec533ee738aeb1ad6cd5c6ee00c105 GIT binary patch literal 161 zcmV;S0ABxi0ey};3d1lE1yk!3>Vtz;pOuOb0q*$rdlmuMS=K{{=;6m~o7}%G_UFlbU{Cm6%R;i literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseSwapping/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/rebaseSwapping/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseSwapping/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/rebaseSwapping/expected/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b/test/integration/rebaseSwapping/expected/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 new file mode 100644 index 0000000000000000000000000000000000000000..ea84eed18c55e29efa1381ea69330142036be6c4 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NvDYc5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lF_@E1>k!sTG*ysY=8z;YvQNB+drapIjH YMsai%W;SO%CmnxsQ`QY^e%tyh@K?n)?f?J) literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c b/test/integration/rebaseSwapping/expected/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c new file mode 100644 index 000000000..16467f7b3 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c @@ -0,0 +1,4 @@ +xA +0@Q9Ed:c2`R"x|{ti8̗TC +RʒZ Sn݋␑2I +VR3UMDOf}m/G ;1O2p?:B \ No newline at end of file diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseSwapping/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 new file mode 100644 index 0000000000000000000000000000000000000000..f390e4e4d3fe101fe8c866915505529f902e024f 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 hDKKHUWODRD_&=j#Wv|j-oVNIq6npD+2mpg5JH=58JZAs^ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 b/test/integration/rebaseSwapping/expected/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 new file mode 100644 index 0000000000000000000000000000000000000000..03ea663e84784d7c88589a0a3df3935c2dd5c8f7 GIT binary patch literal 153 zcmV;K0A~Mq0gaAJ3c@fH0A1%4*^BaCJ})VV2wn9U`MlUd)0Ps!F)PsN?Vu);+oJN}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 b/test/integration/rebaseSwapping/expected/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 new file mode 100644 index 0000000000000000000000000000000000000000..9029233a3adddc5aec9385f35f91417e3d5dd2bb GIT binary patch literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)*$Xl=`AtAX=&HxaXM%;smJ-3^+atJrJRYxXy)Q#! zq{}!&bQI>=hD z0GI@eN}uuC4n58KKFv@0roOLoD_ehP^k+U8hhAS10Mtp(sUd&rsx7OK`T>SrIb?S~ BNJ0Pr literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseSwapping/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseSwapping/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 new file mode 100644 index 0000000000000000000000000000000000000000..f082bca50cf286002d22a8ec7fdbd56a3734044c 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 hDKKI1H_4Z}x=U01mLlh)SBpN~-`)0+9{^tJIj&$}J`Df> literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f b/test/integration/rebaseSwapping/expected/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f new file mode 100644 index 0000000000000000000000000000000000000000..36cb3da9a42e7cec667bdb23e71a9c49fa8d813d GIT binary patch literal 71 zcmV-N0J#5n0ZYosPf{>9Vz7Y#1rJw87p{`j;u2#nTL=L2Ou6hJK*1o@#566{NKa2s dAuTf})kHTrBQY;MHAOcuJux$n3jkJn7BjK(7zh9W literal 0 HcmV?d00001 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/refs/heads/master b/test/integration/rebaseSwapping/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..b99ec7548 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +41eefd8a741d391640c4e0528e0b6fff31f90a18 diff --git a/test/integration/rebaseSwapping/expected/file0 b/test/integration/rebaseSwapping/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebaseSwapping/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebaseSwapping/expected/file1 b/test/integration/rebaseSwapping/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebaseSwapping/expected/file2 b/test/integration/rebaseSwapping/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebaseSwapping/expected/file4 b/test/integration/rebaseSwapping/expected/file4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/rebaseSwapping/expected/file4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/rebaseSwapping/recording.json b/test/integration/rebaseSwapping/recording.json new file mode 100644 index 000000000..87bbffe60 --- /dev/null +++ b/test/integration/rebaseSwapping/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":759,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1102,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1711,"Mod":2,"Key":10,"Ch":10},{"Timestamp":2455,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2943,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3335,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3838,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4390,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5110,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5695,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6207,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6742,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7695,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseSwapping/setup.sh b/test/integration/rebaseSwapping/setup.sh new file mode 100644 index 000000000..864bf5ca9 --- /dev/null +++ b/test/integration/rebaseSwapping/setup.sh @@ -0,0 +1,32 @@ +#!/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 test3 > file4 +git add . +git commit -am file4-added + +echo test4 > file4 +git add . +git commit -am file4-changed + +echo test5 > file4 +git add . +git commit -am file4-changed-again diff --git a/test/integration/rebaseSwapping/test.json b/test/integration/rebaseSwapping/test.json new file mode 100644 index 000000000..102681523 --- /dev/null +++ b/test/integration/rebaseSwapping/test.json @@ -0,0 +1 @@ +{ "description": "Directly swapping two commits, then resolving the conflicts", "speed": 10 } diff --git a/test/integration/stash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stash/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stash/expected/.git_keep/FETCH_HEAD b/test/integration/stash/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stash/expected/.git_keep/HEAD b/test/integration/stash/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stash/expected/.git_keep/ORIG_HEAD b/test/integration/stash/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..43680a2d9 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +05f4edebb0aadc631926ea90f2f4f74033127a19 diff --git a/test/integration/stash/expected/.git_keep/config b/test/integration/stash/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/stash/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/stash/expected/.git_keep/description b/test/integration/stash/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stash/expected/.git_keep/index b/test/integration/stash/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..705b3a73be791ef63776e5b9234c6bbfad9a65f7 GIT binary patch literal 281 zcmZ?q402{*U|<4b=7j8ne42AaKEP;31_l;3-5n1Y7#f!_Ffe`vsu2NVHVYA}D+~T< zZF?7d=zZtXn~(NRHNC~anwFW9Y5 1617674510 +1000 commit (initial): file0 +df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff 211d7ffb63edc061a144eb1e198d94768000c723 CI 1617674510 +1000 commit: file1 +211d7ffb63edc061a144eb1e198d94768000c723 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674510 +1000 commit: file2 +05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674513 +1000 reset: moving to HEAD +05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674513 +1000 reset: moving to HEAD +05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674517 +1000 reset: moving to HEAD diff --git a/test/integration/stash/expected/.git_keep/logs/refs/heads/master b/test/integration/stash/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..0dd71a278 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff CI 1617674510 +1000 commit (initial): file0 +df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff 211d7ffb63edc061a144eb1e198d94768000c723 CI 1617674510 +1000 commit: file1 +211d7ffb63edc061a144eb1e198d94768000c723 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674510 +1000 commit: file2 diff --git a/test/integration/stash/expected/.git_keep/logs/refs/stash b/test/integration/stash/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..2815df3de --- /dev/null +++ b/test/integration/stash/expected/.git_keep/logs/refs/stash @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 1abf1a2a5d2e97b92e49391b4c92f945b5283606 CI 1617674513 +1000 On master: asd +1abf1a2a5d2e97b92e49391b4c92f945b5283606 400778244da4711bc99a7b1a84bab99213601a4e CI 1617674517 +1000 On master: asd diff --git a/test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 b/test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 new file mode 100644 index 0000000000000000000000000000000000000000..14ea7d52a09ed59b15295fc8bc36edde83a49e2a GIT binary patch literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V4QDjjm8iA*Vb;-IWGn6M}_4zdoVYVHl?Dt*u={ z#7jR#bQGc#3>RWTW=u6#o(u#pHIM)i+FY=xBc1Z@8UZ-en!Ob+#zO+e6Q#&@fmAySQ_>m880;8`md^PBp>hhbeQ4AEC=Rh#HkY Am;e9( literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stash/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/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 b/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 new file mode 100644 index 000000000..100e8dc01 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 @@ -0,0 +1 @@ +xϱj1 Eu]J dge\-ݻ|˯3D*Os7 9v^2yc*Zq).fɺ"]sIN)adYzi55*XW36.|Ϗmkx\#eϺ93 `911|y!ÿy_&KF \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stash/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/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 b/test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 new file mode 100644 index 0000000000000000000000000000000000000000..f30621f1bec7a1c0f50dd651d4620bf56b144cb0 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3d0}}K+&!}h5JHr)Hn*I6tc=OCNm=q#3lp_J$`e9Za;7Fd24Oy z7K*?0L)D7I#9WwNAtv$?Qk@y83{`^q;8H9xMKC)Z`tDY0=2_Tj5vGiD2E`nRQ8Gm0 zB%TUmt%g4RwH|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e b/test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e new file mode 100644 index 000000000..791a8042e --- /dev/null +++ b/test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e @@ -0,0 +1,2 @@ +xAj1 d֨*A%Z3aBt߶1>g>,GΌ - +yZ4orn3@vnjo%b*ə %(>W!.^k)IDMJw'|/=?=\r=ۏ=m,ȅ)#rGĴ>J` \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stash/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 new file mode 100644 index 0000000000000000000000000000000000000000..8535af67cc32e9e5e4eea5f934d892197159292d 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 hDKKU@e*BhA%8MMMf=|h_ge#xbiF8V50RVKTIZZy{I~D){ literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 b/test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 new file mode 100644 index 0000000000000000000000000000000000000000..391a716d7e7059d1eaf57bf5070d465bffac3845 GIT binary patch literal 164 zcmV;V09*ff0gaA9YQ!)M0DJZ;bT1UimZfAVrLd=ch8)W@uuhiLg?)Z=>Alxs24>lN zUk60emvOj5mK-B%ku+7xBpF3#tRg&>Nw`>I)+SSU*x}m%%#FQzDQH#~Ni;`so3X{l zO&L?7s77yNv?Eqng}5>iplr0`0J7*2Xl4gaSe)~)&z_6@py SpVj5>3fg-27=8hI-#~o2AW(z= literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stash/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 0000000000000000000000000000000000000000..6a6f2436255b8a831b87262c4d030c7d63af046b GIT binary patch literal 81 zcmV-X0IvUd0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U nND2%Yjvv2elky_RsNhrbEaA#$bt0Y8Sx5?uuqprm;XNz0$Rj03 literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stash/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 @@ -0,0 +1,3 @@ +x+)JMUd040031QHI5`ֶww.hT[H + e"ǨS,gu"YH +$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc b/test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc new file mode 100644 index 0000000000000000000000000000000000000000..10d9df475c2b5f3f1a1f5612b553a537bb56ba47 GIT binary patch literal 162 zcmV;T0A2rh0gaB!3c@fD06pg`_Abcg(L6*%@YK)PB)eEJZK)Cbe0%Zkb(n!EOKVdH zqr;(Z%;0^_C1NU-q(&c#Bx^8B4lcT!qfkuIxu{m!c{!>@eT=@gb42@oU Qb^cv}OiwoI3-%sDT+0kikN^Mx literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 b/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 new file mode 100644 index 000000000..7a7fe2249 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 @@ -0,0 +1 @@ +xjA ESWi^KZ5 s9]{% Wq"۱z Bř.%6r!`d͖EH5<9' 'ϊ(՛4ٴ!ѮPf36>&Rg|gx;+qN""NG '>]OX{ כ?XP \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stash/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/stash/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stash/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c new file mode 100644 index 0000000000000000000000000000000000000000..539f9791905e17d0a85ce5884381ce25c523a355 GIT binary patch literal 107 zcmV-x0F?iD0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%?0_e#<81MUGLyr{r0}mCx!#I;FFa N6c}Sw005AMIi$QpFR=gs literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stash/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/stash/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stash/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 0000000000000000000000000000000000000000..ee4385f12cb5e2fea6044749c3960a2c40be7b9e GIT binary patch literal 28 kcmb4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stash/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/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff b/test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff new file mode 100644 index 0000000000000000000000000000000000000000..341ebdd367d4ff806a4caf207635c3793a043253 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPOY@h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;>0_z YgD_o%nax?xNyneulw}2*1KNKp=5f$GYXATM literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/refs/heads/master b/test/integration/stash/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..43680a2d9 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +05f4edebb0aadc631926ea90f2f4f74033127a19 diff --git a/test/integration/stash/expected/.git_keep/refs/stash b/test/integration/stash/expected/.git_keep/refs/stash new file mode 100644 index 000000000..7fd3144c3 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/refs/stash @@ -0,0 +1 @@ +400778244da4711bc99a7b1a84bab99213601a4e diff --git a/test/integration/stash/expected/file0 b/test/integration/stash/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stash/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stash/expected/file1 b/test/integration/stash/expected/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stash/expected/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stash/expected/file2 b/test/integration/stash/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/stash/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/stash/recording.json b/test/integration/stash/recording.json new file mode 100644 index 000000000..e73c9e3cb --- /dev/null +++ b/test/integration/stash/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1218,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1555,"Mod":0,"Key":256,"Ch":83},{"Timestamp":1868,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2116,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2411,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2459,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2523,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2955,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4059,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4355,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5611,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6427,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6483,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6522,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6907,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7563,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7819,"Mod":0,"Key":259,"Ch":0},{"Timestamp":8139,"Mod":0,"Key":259,"Ch":0},{"Timestamp":8491,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9067,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9843,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stash/setup.sh b/test/integration/stash/setup.sh new file mode 100644 index 000000000..7b6eea95c --- /dev/null +++ b/test/integration/stash/setup.sh @@ -0,0 +1,24 @@ +#!/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 "hello there" > file1 +echo "hello there" > file2 +echo "hello there" > file3 diff --git a/test/integration/stash/test.json b/test/integration/stash/test.json new file mode 100644 index 000000000..4f9314caa --- /dev/null +++ b/test/integration/stash/test.json @@ -0,0 +1 @@ +{ "description": "Stashing some files", "speed": 5 } diff --git a/test/integration/stashFiles/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashFiles/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stashFiles/expected/.git_keep/FETCH_HEAD b/test/integration/stashFiles/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashFiles/expected/.git_keep/HEAD b/test/integration/stashFiles/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD b/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..52c8d5849 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 diff --git a/test/integration/stashFiles/expected/.git_keep/config b/test/integration/stashFiles/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/stashFiles/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/stashFiles/expected/.git_keep/description b/test/integration/stashFiles/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashFiles/expected/.git_keep/index b/test/integration/stashFiles/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..5f67258e95d973701e47af05284f9b71673aa0fc GIT binary patch literal 334 zcmZ?q402{*U|<4bmW1qsjmnp*=D}!2pctF(fv*eI+0H4EQmRVaC5Xg6H`IvfM}>W5yYEggfM4?z8%;cAPqGqns{@J!RCYnxw--w gYz(@F3I<$}M~~^aY=7sk$5VZ#LNr_G;8A@p0L)Zq@&Et; literal 0 HcmV?d00001 diff --git a/test/integration/stashFiles/expected/.git_keep/info/exclude b/test/integration/stashFiles/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/stashFiles/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/stashFiles/expected/.git_keep/logs/HEAD b/test/integration/stashFiles/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..b5128c522 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 5e1c4f2926fa291fbd2f95095429c75bc1148693 CI 1617674625 +1000 commit (initial): file0 +5e1c4f2926fa291fbd2f95095429c75bc1148693 143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 CI 1617674625 +1000 commit: file1 +143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674625 +1000 commit: file2 +ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674628 +1000 reset: moving to HEAD diff --git a/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master b/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..93b075067 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 5e1c4f2926fa291fbd2f95095429c75bc1148693 CI 1617674625 +1000 commit (initial): file0 +5e1c4f2926fa291fbd2f95095429c75bc1148693 143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 CI 1617674625 +1000 commit: file1 +143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674625 +1000 commit: file2 diff --git a/test/integration/stashFiles/expected/.git_keep/logs/refs/stash b/test/integration/stashFiles/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..af582ad3d --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6ca18002905d50a6a77808f8b7d50839f68da7b7 CI 1617674628 +1000 On master: asd diff --git a/test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 b/test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 new file mode 100644 index 0000000000000000000000000000000000000000..d3160cfeecef4d917f783228d12b7c2b9035f143 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@MfQSZCdtGB5uvLdV>+2&!P-(Hczk;Vx1YE8x-QGy zJusg7Zsuz!q{^y+MMbbiYLgb>+-fw8ff6T5;5OOq-F-ID)R2*yAVZrfHqL=_Le`Qe z1xQ!o=;YI%>+Xlq--hvFUs<-7U36XU9taARM40^~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/stashFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashFiles/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/stashFiles/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashFiles/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da new file mode 100644 index 0000000000000000000000000000000000000000..ea6cd38669c9f73920911d2efdafe0a5b6bad32b GIT binary patch literal 85 zcmV-b0IL6Z0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h rTSy8F8IB*nWs~wE$Ee^_@+{%XXLTZ-(pg9fj0h<(#;O1SVZb>0{5mDa literal 0 HcmV?d00001 diff --git a/test/integration/stashFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashFiles/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/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 b/test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 new file mode 100644 index 0000000000000000000000000000000000000000..6ff9310ea046df3b87b97f7f1b8e1efb375f584c GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPOY@h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;>0_z Y&JJ`HW;SO%CmnxsQϗ?~"DžĘ!}b?u ]zJ \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashFiles/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/stashFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashFiles/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/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac b/test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac new file mode 100644 index 0000000000000000000000000000000000000000..2aab99cd868a22be74274c12bdde322e5b190b87 GIT binary patch literal 161 zcmV;S0ABxi0gaA93c@fD06pgwdlzK0Nt3LI2%db#nryIO+EOF4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 diff --git a/test/integration/stashFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashFiles/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/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 b/test/integration/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 new file mode 100644 index 000000000..4803fd8cf --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 @@ -0,0 +1,3 @@ +xA +0E] LDzdfƖ#׺6'SNJ&!TrZ"'!39ҩ.!3KSE)$DU +CtK>v^}^M{}X=h9gO57e': \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/refs/heads/master b/test/integration/stashFiles/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..52c8d5849 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 diff --git a/test/integration/stashFiles/expected/.git_keep/refs/stash b/test/integration/stashFiles/expected/.git_keep/refs/stash new file mode 100644 index 000000000..4b3a3a692 --- /dev/null +++ b/test/integration/stashFiles/expected/.git_keep/refs/stash @@ -0,0 +1 @@ +6ca18002905d50a6a77808f8b7d50839f68da7b7 diff --git a/test/integration/stashFiles/expected/file0 b/test/integration/stashFiles/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stashFiles/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stashFiles/expected/file1 b/test/integration/stashFiles/expected/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashFiles/expected/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashFiles/expected/file2 b/test/integration/stashFiles/expected/file2 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashFiles/expected/file2 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashFiles/expected/file3 b/test/integration/stashFiles/expected/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashFiles/expected/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashFiles/recording.json b/test/integration/stashFiles/recording.json new file mode 100644 index 000000000..e1b1132ad --- /dev/null +++ b/test/integration/stashFiles/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1237,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1677,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1925,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1965,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2053,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2365,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2709,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2941,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3172,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3629,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3973,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4237,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4325,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4477,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4701,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5157,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5957,"Mod":2,"Key":16,"Ch":16},{"Timestamp":6725,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6997,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7613,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashFiles/setup.sh b/test/integration/stashFiles/setup.sh new file mode 100644 index 000000000..7b6eea95c --- /dev/null +++ b/test/integration/stashFiles/setup.sh @@ -0,0 +1,24 @@ +#!/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 "hello there" > file1 +echo "hello there" > file2 +echo "hello there" > file3 diff --git a/test/integration/stashFiles/test.json b/test/integration/stashFiles/test.json new file mode 100644 index 000000000..4f9314caa --- /dev/null +++ b/test/integration/stashFiles/test.json @@ -0,0 +1 @@ +{ "description": "Stashing some files", "speed": 5 } diff --git a/test/integration/stashNewBranch/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashNewBranch/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stashNewBranch/expected/.git_keep/FETCH_HEAD b/test/integration/stashNewBranch/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashNewBranch/expected/.git_keep/HEAD b/test/integration/stashNewBranch/expected/.git_keep/HEAD new file mode 100644 index 000000000..fe9f8c059 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/hello diff --git a/test/integration/stashNewBranch/expected/.git_keep/ORIG_HEAD b/test/integration/stashNewBranch/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..e9ec35d50 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +2ab31642272ef6607700326d4ddb78f35e609d2b diff --git a/test/integration/stashNewBranch/expected/.git_keep/config b/test/integration/stashNewBranch/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/description b/test/integration/stashNewBranch/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashNewBranch/expected/.git_keep/index b/test/integration/stashNewBranch/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..f73149efa0501439043435eee3dda106c7fc2af4 GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1p>^7>v;b}*U|D8{CHx}JfdaR~zh<5!>>5g=x>5V5+l;GfpE zcfp6=cP_p8Xzx_hTMVpenK`KjKxqaBpnetW#%nn+8fwm6G;?^4AHQXj@*>Bm;8XG} z;mT)qBAwD%5OWL>=CmD@2Acz1XE?oSH4Zd7hUmwI^mCxn+7d=U%PQ@`akUk6GXAf4#fZmH#aO0XA~= literal 0 HcmV?d00001 diff --git a/test/integration/stashNewBranch/expected/.git_keep/info/exclude b/test/integration/stashNewBranch/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/logs/HEAD b/test/integration/stashNewBranch/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..369c0b7da --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 797c030ec107d77fa39a1e453ad620235cb26725 CI 1617674783 +1000 commit (initial): file0 +797c030ec107d77fa39a1e453ad620235cb26725 5b9d4ea51af3db649ff3ae4d92b9eacb84218368 CI 1617674783 +1000 commit: file1 +5b9d4ea51af3db649ff3ae4d92b9eacb84218368 2ab31642272ef6607700326d4ddb78f35e609d2b CI 1617674783 +1000 commit: file2 +2ab31642272ef6607700326d4ddb78f35e609d2b 2ab31642272ef6607700326d4ddb78f35e609d2b CI 1617674785 +1000 reset: moving to HEAD +2ab31642272ef6607700326d4ddb78f35e609d2b 71890c9b458697fbb4a6a9dde41614bea569aac8 CI 1617674788 +1000 checkout: moving from master to hello diff --git a/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/hello b/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/hello new file mode 100644 index 000000000..de5f2720f --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/hello @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 71890c9b458697fbb4a6a9dde41614bea569aac8 CI 1617674788 +1000 branch: Created from stash@{0} diff --git a/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/master b/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..06ab45c96 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 797c030ec107d77fa39a1e453ad620235cb26725 CI 1617674783 +1000 commit (initial): file0 +797c030ec107d77fa39a1e453ad620235cb26725 5b9d4ea51af3db649ff3ae4d92b9eacb84218368 CI 1617674783 +1000 commit: file1 +5b9d4ea51af3db649ff3ae4d92b9eacb84218368 2ab31642272ef6607700326d4ddb78f35e609d2b CI 1617674783 +1000 commit: file2 diff --git a/test/integration/stashNewBranch/expected/.git_keep/logs/refs/stash b/test/integration/stashNewBranch/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..fb87f7c50 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 71890c9b458697fbb4a6a9dde41614bea569aac8 CI 1617674785 +1000 On master: asd diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashNewBranch/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da new file mode 100644 index 0000000000000000000000000000000000000000..ea6cd38669c9f73920911d2efdafe0a5b6bad32b GIT binary patch literal 85 zcmV-b0IL6Z0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h rTSy8F8IB*nWs~wE$Ee^_@+{%XXLTZ-(pg9fj0h<(#;O1SVZb>0{5mDa literal 0 HcmV?d00001 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b b/test/integration/stashNewBranch/expected/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b new file mode 100644 index 0000000000000000000000000000000000000000..cfc4b63ec4628468f653d3515fcbde3a422c806f GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-U~%nqbrnB$SKcQ-IWGn4Z%X6-#nq$VHl?L*4CkI zg3CBWbP`00h6^$RGf>TyCu3uf8c{4FxLly9oep^qJ>|q+XtGot=ipPVj>L0e6sqLHGN^cKs!IWWZI;O6N BLm&VE literal 0 HcmV?d00001 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 b/test/integration/stashNewBranch/expected/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 new file mode 100644 index 0000000000000000000000000000000000000000..ebaaf1061f15a816a9642edab31d38b7430d50d4 GIT binary patch literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MfQSBGRceq5uvLdV>+2&!P-(Hczk;Vx1YE8x-QGy zeJJtNcQapsNwug#5fzCQsZGjKa;s<&fl^77g4<-bclTUa0l_o?SLP;IBv{HQl_EsU zIz{4`oqYOp-Tg57+b}-tE6et>i>}Mv2MSD__=^4<0KgsfnCkW?cWr)Ia6e};IV*Qa BMV0^n literal 0 HcmV?d00001 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 b/test/integration/stashNewBranch/expected/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 new file mode 100644 index 000000000..74401c735 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 @@ -0,0 +1,2 @@ +x1N1 E鑐$vBi8{Y'm#`eM9 +Rs6,XI$tjK2"D ,5k*N hm~t+KR!D4| ˫}SK8s-qL:OO}y韂II \ No newline at end of file diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 b/test/integration/stashNewBranch/expected/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 new file mode 100644 index 0000000000000000000000000000000000000000..0b19e28732b8ef5e1783dc4062dff90e907b4292 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+drapIj< YKMr&iW;SO%CmnxsQ`QY^e%>)F{xSMBOaK4? literal 0 HcmV?d00001 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 b/test/integration/stashNewBranch/expected/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 new file mode 100644 index 0000000000000000000000000000000000000000..2e44cbb7827c9a077190a24303a31be02c947387 GIT binary patch literal 162 zcmV;T0A2rh0gaA93c@fD06pgwdlw|xq`O%W5qjz~(qxMT)0SGH&$k!vUWXZ&Jl8sI zfR0bwstOnz$&#AE2cM%Alo&!G4N^P{_Tor#D9J2o)#(UR?;Qn1MjePOv$Y4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashNewBranch/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/stashNewBranch/expected/.git_keep/refs/heads/hello b/test/integration/stashNewBranch/expected/.git_keep/refs/heads/hello new file mode 100644 index 000000000..abd2f9527 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/refs/heads/hello @@ -0,0 +1 @@ +71890c9b458697fbb4a6a9dde41614bea569aac8 diff --git a/test/integration/stashNewBranch/expected/.git_keep/refs/heads/master b/test/integration/stashNewBranch/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..e9ec35d50 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +2ab31642272ef6607700326d4ddb78f35e609d2b diff --git a/test/integration/stashNewBranch/expected/.git_keep/refs/stash b/test/integration/stashNewBranch/expected/.git_keep/refs/stash new file mode 100644 index 000000000..abd2f9527 --- /dev/null +++ b/test/integration/stashNewBranch/expected/.git_keep/refs/stash @@ -0,0 +1 @@ +71890c9b458697fbb4a6a9dde41614bea569aac8 diff --git a/test/integration/stashNewBranch/expected/file0 b/test/integration/stashNewBranch/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stashNewBranch/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stashNewBranch/expected/file1 b/test/integration/stashNewBranch/expected/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashNewBranch/expected/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashNewBranch/expected/file2 b/test/integration/stashNewBranch/expected/file2 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashNewBranch/expected/file2 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashNewBranch/expected/file3 b/test/integration/stashNewBranch/expected/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashNewBranch/expected/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashNewBranch/recording.json b/test/integration/stashNewBranch/recording.json new file mode 100644 index 000000000..945677525 --- /dev/null +++ b/test/integration/stashNewBranch/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":451,"Mod":0,"Key":256,"Ch":97},{"Timestamp":980,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1236,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1324,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1404,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1668,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2109,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2420,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2748,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4036,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4332,"Mod":0,"Key":256,"Ch":104},{"Timestamp":4452,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4580,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4700,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4836,"Mod":0,"Key":256,"Ch":111},{"Timestamp":5084,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5964,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashNewBranch/setup.sh b/test/integration/stashNewBranch/setup.sh new file mode 100644 index 000000000..7b6eea95c --- /dev/null +++ b/test/integration/stashNewBranch/setup.sh @@ -0,0 +1,24 @@ +#!/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 "hello there" > file1 +echo "hello there" > file2 +echo "hello there" > file3 diff --git a/test/integration/stashNewBranch/test.json b/test/integration/stashNewBranch/test.json new file mode 100644 index 000000000..ac2d98f0a --- /dev/null +++ b/test/integration/stashNewBranch/test.json @@ -0,0 +1 @@ +{ "description": "Creating a new branch from a stash entry", "speed": 5 } diff --git a/test/integration/tags/test.json b/test/integration/tags/test.json index 05914d80f..4d1d46ee2 100644 --- a/test/integration/tags/test.json +++ b/test/integration/tags/test.json @@ -1 +1 @@ -{ "description": "basic CRUD for tags", "speed": 1 } +{ "description": "basic CRUD for tags", "speed": 5 } diff --git a/test/integration/tags2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/tags2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..bfd6a6583 --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file4 diff --git a/test/integration/tags2/expected/.git_keep/FETCH_HEAD b/test/integration/tags2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/tags2/expected/.git_keep/HEAD b/test/integration/tags2/expected/.git_keep/HEAD new file mode 100644 index 000000000..12dd5a89a --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +6ecb690d237f4196cb3ec881669c7e9e348939c0 diff --git a/test/integration/tags2/expected/.git_keep/ORIG_HEAD b/test/integration/tags2/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..2015962e4 --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +7d431518930a9fd2d08a09705645fe45d8507860 diff --git a/test/integration/tags2/expected/.git_keep/config b/test/integration/tags2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/tags2/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/tags2/expected/.git_keep/description b/test/integration/tags2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags2/expected/.git_keep/index b/test/integration/tags2/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..7fce3cbc0c61d6fd8cf86573fa1160aa3b4cfa79 GIT binary patch literal 281 zcmZ?q402{*U|<4b=7j9+aY9ksHo<5{1_l;3T@OA6hQ=if42)laYD9pT%|gWL%7TAd z+uj8qdf&P9=A*q+O>Z%FM-5d#?A4UyI`_8>wwJ5x*zvY$od<%7mIYwY} zLV{dffec9oV+8}Qc^%7nPu$SGw0{3p# 1617672030 +1000 commit (initial): file0 +756089d39d55db6e11af06cb9c95f6d81f5d47ae 6ecb690d237f4196cb3ec881669c7e9e348939c0 CI 1617672030 +1000 commit: file1 +6ecb690d237f4196cb3ec881669c7e9e348939c0 7d431518930a9fd2d08a09705645fe45d8507860 CI 1617672030 +1000 commit: file2 +7d431518930a9fd2d08a09705645fe45d8507860 dc46c2541c98c11cce0ec0a67f7d95f81686b1e4 CI 1617672030 +1000 commit: file4 +dc46c2541c98c11cce0ec0a67f7d95f81686b1e4 7d431518930a9fd2d08a09705645fe45d8507860 CI 1617672036 +1000 checkout: moving from master to one +7d431518930a9fd2d08a09705645fe45d8507860 6ecb690d237f4196cb3ec881669c7e9e348939c0 CI 1617672038 +1000 reset: moving to 6ecb690d237f4196cb3ec881669c7e9e348939c0 diff --git a/test/integration/tags2/expected/.git_keep/logs/refs/heads/master b/test/integration/tags2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..e4a85e770 --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 756089d39d55db6e11af06cb9c95f6d81f5d47ae CI 1617672030 +1000 commit (initial): file0 +756089d39d55db6e11af06cb9c95f6d81f5d47ae 6ecb690d237f4196cb3ec881669c7e9e348939c0 CI 1617672030 +1000 commit: file1 +6ecb690d237f4196cb3ec881669c7e9e348939c0 7d431518930a9fd2d08a09705645fe45d8507860 CI 1617672030 +1000 commit: file2 +7d431518930a9fd2d08a09705645fe45d8507860 dc46c2541c98c11cce0ec0a67f7d95f81686b1e4 CI 1617672030 +1000 commit: file4 diff --git a/test/integration/tags2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/tags2/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/tags2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags2/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/tags2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags2/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/tags2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 new file mode 100644 index 0000000000000000000000000000000000000000..39b5247e9c4f795126961919183ac72602b03cfa 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 hDKKHUpUta%rtH}p{!&=4sRdi?eXZXX}Kxz)OK z64guJ01^yvK7|l+lDl^?3&4+5w6ION*Z>Wx*2G``w2j7zp5ye!9_x3-ZEp2N;>0^| Yd0@HRDa#5r2iW2(+yyZ@8vpfTlRo{m9d?@SIL%M}rnawoldV0h3uitec(7Lo0Oq9URM$UsQ=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/tags2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags2/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/tags2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/tags2/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/tags2/expected/.git_keep/objects/dc/46c2541c98c11cce0ec0a67f7d95f81686b1e4 b/test/integration/tags2/expected/.git_keep/objects/dc/46c2541c98c11cce0ec0a67f7d95f81686b1e4 new file mode 100644 index 000000000..c8fd68546 --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/objects/dc/46c2541c98c11cce0ec0a67f7d95f81686b1e4 @@ -0,0 +1,4 @@ +xM +0@a9E$3"BW=LR"x|{o歵[UK |U%DaOrX#c$ +$qUb +`_aЯ}ۼŀ1D'7uY7 \ No newline at end of file diff --git a/test/integration/tags2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/tags2/expected/.git_keep/refs/heads/master b/test/integration/tags2/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..efe1467dc --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +dc46c2541c98c11cce0ec0a67f7d95f81686b1e4 diff --git a/test/integration/tags2/expected/.git_keep/refs/tags/one b/test/integration/tags2/expected/.git_keep/refs/tags/one new file mode 100644 index 000000000..2015962e4 --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/refs/tags/one @@ -0,0 +1 @@ +7d431518930a9fd2d08a09705645fe45d8507860 diff --git a/test/integration/tags2/expected/.git_keep/refs/tags/two b/test/integration/tags2/expected/.git_keep/refs/tags/two new file mode 100644 index 000000000..12dd5a89a --- /dev/null +++ b/test/integration/tags2/expected/.git_keep/refs/tags/two @@ -0,0 +1 @@ +6ecb690d237f4196cb3ec881669c7e9e348939c0 diff --git a/test/integration/tags2/expected/file0 b/test/integration/tags2/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/tags2/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/tags2/expected/file1 b/test/integration/tags2/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/tags2/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/tags2/expected/file2 b/test/integration/tags2/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/tags2/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/tags2/recording.json b/test/integration/tags2/recording.json new file mode 100644 index 000000000..b2ce8c043 --- /dev/null +++ b/test/integration/tags2/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":534,"Mod":0,"Key":259,"Ch":0},{"Timestamp":791,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1128,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1759,"Mod":0,"Key":256,"Ch":84},{"Timestamp":2062,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2094,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2182,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2368,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2711,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3006,"Mod":0,"Key":256,"Ch":84},{"Timestamp":3230,"Mod":0,"Key":256,"Ch":116},{"Timestamp":3367,"Mod":0,"Key":256,"Ch":119},{"Timestamp":3454,"Mod":0,"Key":256,"Ch":111},{"Timestamp":3759,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4127,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4646,"Mod":0,"Key":256,"Ch":93},{"Timestamp":4815,"Mod":0,"Key":256,"Ch":93},{"Timestamp":5710,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6511,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6935,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7645,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8079,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8534,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8806,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9422,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/tags2/setup.sh b/test/integration/tags2/setup.sh new file mode 100644 index 000000000..d11e86c0a --- /dev/null +++ b/test/integration/tags2/setup.sh @@ -0,0 +1,24 @@ +#!/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 test3 > file4 +git add . +git commit -am file4 diff --git a/test/integration/tags2/test.json b/test/integration/tags2/test.json new file mode 100644 index 000000000..595398f37 --- /dev/null +++ b/test/integration/tags2/test.json @@ -0,0 +1 @@ +{ "description": "checking out and resetting to tags", "speed": 10 } diff --git a/test/integration/tags3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/tags3/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..bfd6a6583 --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file4 diff --git a/test/integration/tags3/expected/.git_keep/FETCH_HEAD b/test/integration/tags3/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/tags3/expected/.git_keep/HEAD b/test/integration/tags3/expected/.git_keep/HEAD new file mode 100644 index 000000000..cea9d05ed --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/test diff --git a/test/integration/tags3/expected/.git_keep/config b/test/integration/tags3/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/tags3/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/tags3/expected/.git_keep/description b/test/integration/tags3/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags3/expected/.git_keep/index b/test/integration/tags3/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..1960aed9e59f71c08e5a45609d42a222358ee18d GIT binary patch literal 209 zcmZ?q402{*U|<5_gzO!qynCg;!DvPX1{OBmpl1vWjY}997{3D5hyXF0g^1Oa1^=|R zy$e3{zH{l#M|-E5-eO=)%gjkN07^43fb{cSHa-laq2~NWH)rXd$A48*Z+wXejpE67 zx)9*i(tQ5 literal 0 HcmV?d00001 diff --git a/test/integration/tags3/expected/.git_keep/info/exclude b/test/integration/tags3/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/tags3/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/tags3/expected/.git_keep/logs/HEAD b/test/integration/tags3/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..e39103406 --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 54bd2b22db1e849928a333ebfe8f3fba1159adde CI 1617672309 +1000 commit (initial): file0 +54bd2b22db1e849928a333ebfe8f3fba1159adde b81aa63f3545be4f565c8a64a943517c8da94a6e CI 1617672309 +1000 commit: file1 +b81aa63f3545be4f565c8a64a943517c8da94a6e 29ff87a318d242acab116d17e421480b5d8002cd CI 1617672309 +1000 commit: file2 +29ff87a318d242acab116d17e421480b5d8002cd ecf6d101974303948e79d673ccff18c592f89650 CI 1617672309 +1000 commit: file4 +ecf6d101974303948e79d673ccff18c592f89650 b81aa63f3545be4f565c8a64a943517c8da94a6e CI 1617672318 +1000 checkout: moving from master to test diff --git a/test/integration/tags3/expected/.git_keep/logs/refs/heads/master b/test/integration/tags3/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..11174511b --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 54bd2b22db1e849928a333ebfe8f3fba1159adde CI 1617672309 +1000 commit (initial): file0 +54bd2b22db1e849928a333ebfe8f3fba1159adde b81aa63f3545be4f565c8a64a943517c8da94a6e CI 1617672309 +1000 commit: file1 +b81aa63f3545be4f565c8a64a943517c8da94a6e 29ff87a318d242acab116d17e421480b5d8002cd CI 1617672309 +1000 commit: file2 +29ff87a318d242acab116d17e421480b5d8002cd ecf6d101974303948e79d673ccff18c592f89650 CI 1617672309 +1000 commit: file4 diff --git a/test/integration/tags3/expected/.git_keep/logs/refs/heads/test b/test/integration/tags3/expected/.git_keep/logs/refs/heads/test new file mode 100644 index 000000000..ba94eca60 --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/logs/refs/heads/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 b81aa63f3545be4f565c8a64a943517c8da94a6e CI 1617672318 +1000 branch: Created from b81aa63f3545be4f565c8a64a943517c8da94a6e diff --git a/test/integration/tags3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/tags3/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/tags3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags3/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/tags3/expected/.git_keep/objects/29/ff87a318d242acab116d17e421480b5d8002cd b/test/integration/tags3/expected/.git_keep/objects/29/ff87a318d242acab116d17e421480b5d8002cd new file mode 100644 index 0000000000000000000000000000000000000000..fbf99e4294011c079a50ea5743d9065c8ebfe556 GIT binary patch literal 148 zcmV;F0Biqv0gaAJ3Iib!1+(@P?gPR0+d>F|Sk`}Qyvs=5QnbcF zn3=iAv!Ks-^;0gZyf5pMztoPMZ@IUJ1V8gZ8x`dhlu}~Sd1~;Vx~SXETKoXcPC5j{ C)JN6; literal 0 HcmV?d00001 diff --git a/test/integration/tags3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags3/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/tags3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 new file mode 100644 index 0000000000000000000000000000000000000000..39b5247e9c4f795126961919183ac72602b03cfa 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 hDKKHUpUta%rtH}p{!NO|S{[{!ǤO겂۝+ \ No newline at end of file diff --git a/test/integration/tags3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/tags3/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/tags3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags3/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/tags3/expected/.git_keep/objects/b8/1aa63f3545be4f565c8a64a943517c8da94a6e b/test/integration/tags3/expected/.git_keep/objects/b8/1aa63f3545be4f565c8a64a943517c8da94a6e new file mode 100644 index 0000000000000000000000000000000000000000..28c2977cfffd4d0d120bf4b45026253385f7d78e GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZodoL7Mjb@>gLQZ+cx~?=3n-DDY`OOo09fo0KYi;R( z?DYbE@l~x~a>mXny$AI&&#A BN2CA% literal 0 HcmV?d00001 diff --git a/test/integration/tags3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/tags3/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/tags3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/tags3/expected/.git_keep/objects/ec/f6d101974303948e79d673ccff18c592f89650 b/test/integration/tags3/expected/.git_keep/objects/ec/f6d101974303948e79d673ccff18c592f89650 new file mode 100644 index 000000000..108b94b62 --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/objects/ec/f6d101974303948e79d673ccff18c592f89650 @@ -0,0 +1,2 @@ +xM +0@a9EL& "tcL Z[Jo-^u3]jC`a.&N@Cf0Is4rk)TILbT& J5hԯc +99Onڼ(8 \ No newline at end of file diff --git a/test/integration/tags3/expected/.git_keep/refs/heads/master b/test/integration/tags3/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..3e10d4f18 --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +ecf6d101974303948e79d673ccff18c592f89650 diff --git a/test/integration/tags3/expected/.git_keep/refs/heads/test b/test/integration/tags3/expected/.git_keep/refs/heads/test new file mode 100644 index 000000000..9f242181c --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/refs/heads/test @@ -0,0 +1 @@ +b81aa63f3545be4f565c8a64a943517c8da94a6e diff --git a/test/integration/tags3/expected/.git_keep/refs/tags/one b/test/integration/tags3/expected/.git_keep/refs/tags/one new file mode 100644 index 000000000..59d657fcd --- /dev/null +++ b/test/integration/tags3/expected/.git_keep/refs/tags/one @@ -0,0 +1 @@ +29ff87a318d242acab116d17e421480b5d8002cd diff --git a/test/integration/tags3/expected/file0 b/test/integration/tags3/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/tags3/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/tags3/expected/file1 b/test/integration/tags3/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/tags3/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/tags3/recording.json b/test/integration/tags3/recording.json new file mode 100644 index 000000000..87c6bdd11 --- /dev/null +++ b/test/integration/tags3/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":649,"Mod":0,"Key":259,"Ch":0},{"Timestamp":834,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1065,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1817,"Mod":0,"Key":256,"Ch":84},{"Timestamp":2609,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2689,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2833,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3105,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3578,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4217,"Mod":0,"Key":256,"Ch":93},{"Timestamp":4529,"Mod":0,"Key":256,"Ch":93},{"Timestamp":6161,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6985,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7898,"Mod":0,"Key":256,"Ch":110},{"Timestamp":8338,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8385,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8537,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8577,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8857,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9849,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/tags3/setup.sh b/test/integration/tags3/setup.sh new file mode 100644 index 000000000..d11e86c0a --- /dev/null +++ b/test/integration/tags3/setup.sh @@ -0,0 +1,24 @@ +#!/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 test3 > file4 +git add . +git commit -am file4 diff --git a/test/integration/tags3/test.json b/test/integration/tags3/test.json new file mode 100644 index 000000000..e376ed544 --- /dev/null +++ b/test/integration/tags3/test.json @@ -0,0 +1 @@ +{ "description": "viewing commits of tags", "speed": 10 }