diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-19 22:38:32 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-19 22:38:32 +1100 |
commit | b13cfdfea068919ed120c454368c3ce18b21eda9 (patch) | |
tree | f5eaff5da52e4cb023f1d0644f32a1c0f9a557a2 /test | |
parent | b6472415210a9cc74024d82c10e928ea153f3ad9 (diff) |
migrate branch reset integration test
Diffstat (limited to 'test')
64 files changed, 20 insertions, 205 deletions
diff --git a/test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 7156ee2dc..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -fourth commit on master diff --git a/test/integration/branchReset/expected/repo/.git_keep/HEAD b/test/integration/branchReset/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD b/test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index f6edb547f..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 diff --git a/test/integration/branchReset/expected/repo/.git_keep/index b/test/integration/branchReset/expected/repo/.git_keep/index Binary files differdeleted file mode 100644 index 7128740a2..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/index +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/logs/HEAD b/test/integration/branchReset/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index da396669b..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,18 +0,0 @@ -0000000000000000000000000000000000000000 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI <CI@example.com> 1617686737 +1000 commit (initial): first commit -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI <CI@example.com> 1617686737 +1000 checkout: moving from master to develop -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 c23c3e0496a9b3decc42344bfd94514f0834b93c CI <CI@example.com> 1617686737 +1000 commit: first commit on develop -c23c3e0496a9b3decc42344bfd94514f0834b93c 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI <CI@example.com> 1617686737 +1000 checkout: moving from develop to master -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 CI <CI@example.com> 1617686737 +1000 commit: first commit on master -bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 c23c3e0496a9b3decc42344bfd94514f0834b93c CI <CI@example.com> 1617686737 +1000 checkout: moving from master to develop -c23c3e0496a9b3decc42344bfd94514f0834b93c 8b24e74245461f6ad529c77c040fe17e415cf3da CI <CI@example.com> 1617686737 +1000 commit: second commit on develop -8b24e74245461f6ad529c77c040fe17e415cf3da bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 CI <CI@example.com> 1617686737 +1000 checkout: moving from develop to master -bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 106606554f129e8b6e4b942908734deef5628dcd CI <CI@example.com> 1617686737 +1000 commit: second commit on master -106606554f129e8b6e4b942908734deef5628dcd 8b24e74245461f6ad529c77c040fe17e415cf3da CI <CI@example.com> 1617686737 +1000 checkout: moving from master to develop -8b24e74245461f6ad529c77c040fe17e415cf3da eea0cf47f42fe8d027b4cecaf534ecc0673f7981 CI <CI@example.com> 1617686737 +1000 commit: third commit on develop -eea0cf47f42fe8d027b4cecaf534ecc0673f7981 106606554f129e8b6e4b942908734deef5628dcd CI <CI@example.com> 1617686737 +1000 checkout: moving from develop to master -106606554f129e8b6e4b942908734deef5628dcd a73e01f9d181ff16b3d821dd962e98accbd62936 CI <CI@example.com> 1617686737 +1000 commit: third commit on master -a73e01f9d181ff16b3d821dd962e98accbd62936 eea0cf47f42fe8d027b4cecaf534ecc0673f7981 CI <CI@example.com> 1617686737 +1000 checkout: moving from master to develop -eea0cf47f42fe8d027b4cecaf534ecc0673f7981 27ba706fa463253f9189b2f258430877d2b5ed4f CI <CI@example.com> 1617686737 +1000 commit: fourth commit on develop -27ba706fa463253f9189b2f258430877d2b5ed4f a73e01f9d181ff16b3d821dd962e98accbd62936 CI <CI@example.com> 1617686737 +1000 checkout: moving from develop to master -a73e01f9d181ff16b3d821dd962e98accbd62936 7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 CI <CI@example.com> 1617686737 +1000 commit: fourth commit on master -7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 27ba706fa463253f9189b2f258430877d2b5ed4f CI <CI@example.com> 1617686741 +1000 reset: moving to develop diff --git a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 911311dc4..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI <CI@example.com> 1617686737 +1000 branch: Created from HEAD -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 c23c3e0496a9b3decc42344bfd94514f0834b93c CI <CI@example.com> 1617686737 +1000 commit: first commit on develop -c23c3e0496a9b3decc42344bfd94514f0834b93c 8b24e74245461f6ad529c77c040fe17e415cf3da CI <CI@example.com> 1617686737 +1000 commit: second commit on develop -8b24e74245461f6ad529c77c040fe17e415cf3da eea0cf47f42fe8d027b4cecaf534ecc0673f7981 CI <CI@example.com> 1617686737 +1000 commit: third commit on develop -eea0cf47f42fe8d027b4cecaf534ecc0673f7981 27ba706fa463253f9189b2f258430877d2b5ed4f CI <CI@example.com> 1617686737 +1000 commit: fourth commit on develop diff --git a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 0f20bf8e9..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI <CI@example.com> 1617686737 +1000 commit (initial): first commit -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 CI <CI@example.com> 1617686737 +1000 commit: first commit on master -bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 106606554f129e8b6e4b942908734deef5628dcd CI <CI@example.com> 1617686737 +1000 commit: second commit on master -106606554f129e8b6e4b942908734deef5628dcd a73e01f9d181ff16b3d821dd962e98accbd62936 CI <CI@example.com> 1617686737 +1000 commit: third commit on master -a73e01f9d181ff16b3d821dd962e98accbd62936 7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 CI <CI@example.com> 1617686737 +1000 commit: fourth commit on master -7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 27ba706fa463253f9189b2f258430877d2b5ed4f CI <CI@example.com> 1617686741 +1000 reset: moving to develop diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d Binary files differdeleted file mode 100644 index 8d42c4c9e..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd b/test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd deleted file mode 100644 index 1b374995a..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]$&DzI2E4
xރj)SE@'r&&dMC\dj]11`=X8#/!-xPn4uᲽj:FgZSM!~ -V_@
\ No newline at end of file diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Binary files differdeleted file mode 100644 index f74bf2335..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca Binary files differdeleted file mode 100644 index 2b02dc3d1..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af Binary files differdeleted file mode 100644 index 27c11bb26..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f b/test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f deleted file mode 100644 index 892cab8e4..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f +++ /dev/null @@ -1,2 +0,0 @@ -xM -0)Pb~J)ԈWf`,˫a M[q,6G$fNFVmqZ Z
ٚ6iF+]c!}hrZVS٩O|IYĞoO3ЕTşDJ oeS_ɨB)
\ No newline at end of file diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd Binary files differdeleted file mode 100644 index e8d63bced..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 b/test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 Binary files differdeleted file mode 100644 index d7f891ede..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 deleted file mode 100644 index e0670d284..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 +++ /dev/null @@ -1 +0,0 @@ -x 0CvL\jVОW=M<if.PUMHT3T`Q9"^hd[i+B;~/ Y:/<P
\ No newline at end of file diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/branchReset/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 Binary files differdeleted file mode 100644 index 27ac61738..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 Binary files differdeleted file mode 100644 index bfb5376c6..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 b/test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 Binary files differdeleted file mode 100644 index f6a9427bc..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 b/test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 deleted file mode 100644 index 28f456f97..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]$U1If`RS^<Omg3&7Ef K -WLNFs)v^3QBF"h~8xJ)f;cm;L3ܦ*ۋ/;;gu֪ϹzmuBn/hA
\ No newline at end of file diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 Binary files differdeleted file mode 100644 index ea7fa5303..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da b/test/integration/branchReset/expected/repo/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da Binary files differdeleted file mode 100644 index 2e326b548..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 b/test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 Binary files differdeleted file mode 100644 index f502f942f..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 Binary files differdeleted file mode 100644 index ffc277c86..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/branchReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Binary files differdeleted file mode 100644 index 285df3e5f..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 b/test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 Binary files differdeleted file mode 100644 index 687d5f69e..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 b/test/integration/branchReset/expected/repo/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 Binary files differdeleted file mode 100644 index 0bb03b936..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c b/test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c Binary files differdeleted file mode 100644 index 0a58eb348..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c +++ /dev/null diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 b/test/integration/branchReset/expected/repo/.git_keep/o |