summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-09-16 22:15:02 -0700
committerJesse Duffield <jessedduffield@gmail.com>2022-09-16 22:15:16 -0700
commit74acb3e86a3b171c79c06e3d5d02abcfe5c8cdd0 (patch)
treea68f7659fab9157d74bd39e9a296b26531ee1f66 /test
parent9351af382933d456de65acab1451b17677ddb171 (diff)
add integration tests for cherry picking
Diffstat (limited to 'test')
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/COMMIT_EDITMSG15
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/REBASE_HEAD1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/indexbin1356 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/logs/HEAD40
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/base_branch3
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/develop5
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking9
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/master5
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/other_branch3
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59febin158 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585dbin112 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a24
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09bin34 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242cbin177 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7bin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6dbin153 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27cabin50 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77bin144 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0bin208 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4afbin117 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885bin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d2
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4bin327 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce5873
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420bin121 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8bin150 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e78312
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcdbin120 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8cbin252 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f5281803
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c251
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/2484f3cb6ce658e296526c48e1a376b2790dfcbin147 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0bin33 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3bin86 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6bin54 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9bin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/65/c0438e428cd1aa94588eaa52eb7ebad7ec62fdbin168 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f2
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4bin156 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98bin233 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec2
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54bin328 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee2
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd9295473
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8dbin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8bin65 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cdbin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09cbin358 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048bin154 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242bin54 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9cbin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520bin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722bin162 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2ebin254 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec22
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58bin277 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68bin183 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993bin303 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4bin201 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe23612033682
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0bin227 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6ebin50 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511bin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439bin86 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc2
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3dbin361 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7bin66 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7bin162 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2bin144 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed92
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4bin54 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/f4/ffac820a371104fe611d81bc13a45b70a3ebb3bin158 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc6996712
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007bin352 -> 0 bytes
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/base_branch1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/develop1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/feature/cherry-picking1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/other_branch1
-rw-r--r--test/integration/cherryPicking/expected/repo/cherrypicking31
-rw-r--r--test/integration/cherryPicking/expected/repo/cherrypicking41
-rw-r--r--test/integration/cherryPicking/expected/repo/cherrypicking51
-rw-r--r--test/integration/cherryPicking/expected/repo/directory/file1
-rw-r--r--test/integration/cherryPicking/expected/repo/directory/file21
-rw-r--r--test/integration/cherryPicking/expected/repo/file1
-rw-r--r--test/integration/cherryPicking/expected/repo/file163
-rw-r--r--test/integration/cherryPicking/expected/repo/file31
-rw-r--r--test/integration/cherryPicking/expected/repo/file41
-rw-r--r--test/integration/cherryPicking/expected/repo/file51
-rw-r--r--test/integration/cherryPicking/recording.json1
-rw-r--r--test/integration/cherryPicking/setup.sh157
-rw-r--r--test/integration/cherryPicking/test.json1
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/FETCH_HEAD (renamed from test/integration/cherryPicking/expected/repo/.git_keep/FETCH_HEAD)0
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/config (renamed from test/integration/cherryPicking/expected/repo/.git_keep/config)2
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/description (renamed from test/integration/cherryPicking/expected/repo/.git_keep/description)0
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/indexbin0 -> 65 bytes
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/info/exclude (renamed from test/integration/cherryPicking/expected/repo/.git_keep/info/exclude)0
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/HEAD14
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch4
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master1
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch3
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/7a799a14b2ca7478cfe339e7c83f7cdea4918bbin0 -> 147 bytes
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/8998809e08270eebeb746d6aed45df9faee6a22
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/2b/10745f8823e1d49edc446ea1440d7730a6625bbin0 -> 146 bytes
-rw-r--r--test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904bin0 -> 15 bytes
-rw-r--r--test/integration_new/cherry