summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-08-22 20:43:19 +1000
committerJesse Duffield <jessedduffield@gmail.com>2022-09-09 20:55:47 -0700
commit7b757d1cfe88363aa52a660d53838478243eca00 (patch)
treeaf9dd9950f13ba22f13dd9c844421b6858eb18f4 /test
parent843488bff4b128f5227657f0e16dd42299420532 (diff)
add branch rebase integration test
Diffstat (limited to 'test')
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG18
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/indexbin835 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD22
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop5
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master6
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585dbin112 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27cabin50 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4afbin117 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4bin74 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcdbin120 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2fbin121 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed17482
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5bin120 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95bin160 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c251
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731bin107 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3bin86 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6bin54 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6bin157 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7bin160 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3bin111 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8bin65 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960bin117 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae732
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab183
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242bin54 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae122
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014bin120 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f6
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c1
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6ebin50 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439bin86 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5bin159 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4bin54 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f343734
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772bbin85 -> 0 bytes
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop1
-rw-r--r--test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/branchRebase/expected/repo/directory/file1
-rw-r--r--test/integration/branchRebase/expected/repo/directory/file21
-rw-r--r--test/integration/branchRebase/expected/repo/file163
-rw-r--r--test/integration/branchRebase/expected/repo/file31
-rw-r--r--test/integration/branchRebase/expected/repo/file41
-rw-r--r--test/integration/branchRebase/expected/repo/file51
-rw-r--r--test/integration/branchRebase/recording.json1
-rw-r--r--test/integration/branchRebase/setup.sh85
-rw-r--r--test/integration/branchRebase/test.json1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/FETCH_HEAD (renamed from test/integration/branchRebase/expected/repo/.git_keep/FETCH_HEAD)0
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG4
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/config (renamed from test/integration/branchRebase/expected/repo/.git_keep/config)2
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/description (renamed from test/integration/branchRebase/expected/repo/.git_keep/description)0
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/indexbin0 -> 212 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude (renamed from test/integration/branchRebase/expected/repo/.git_keep/info/exclude)0
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD13
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch3
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch4
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch3
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179bin0 -> 49 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/02/27353d56e56df9e9f94559f90b86ce7aa1ca5c2
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368cbin0 -> 48 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804bin0 -> 46 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55bin0 -> 49 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65bin0 -> 43 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904bin0 -> 15 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9bin0 -> 41 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3dbin0 -> 148 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37bin0 -> 170 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/70/2b646c08ba47b2ac5729deed77188ef1647b4d2
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/ab/1329d5c536f369c741c65fab7cca4ab27dc22ebin0 -> 85 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/b8/27df09781d0648f66cd9a01f0ec0ad5d412e10bin0 -> 150 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412bin0 -> 147 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/objects/f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2bin0 -> 154 bytes
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch1
-rw-r--r--test/integration_new/branch/rebase/expected/repo/file6
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config12
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description1
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/indexbin0 -> 212 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD16
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch5
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch4
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch3
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179bin0 -> 49 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368cbin0 -> 48 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804bin0 -> 46 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55bin0 -> 49 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/32/28c73cfc742264f3101966a81d6a0a70488e36bin0 -> 167 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/39/129f24587bdc648e1fdb6f0b089c0846f54d452
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65bin0 -> 43 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6bin0 -> 154 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904bin0 -> 15 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9bin0 -> 41 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a2
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27ccbin0 -> 85 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415bin0 -> 147 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12bin0 -> 152 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dcbin0 -> 146 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65bin0 -> 117 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499bin0 -> 149 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cffbin0 -> 151 bytes
-rw-r--r--test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs