update patch building with filetree test

2025-03-21 21:47:32 +02:00 · 2021-04-05 11:44:57 +10:00 · 2021-04-05 11:44:57 +10:00 · 8681a6b4e2
commit 8681a6b4e2
parent efed313721
31 changed files with 13 additions and 26 deletions
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG
@ -1 +1 @@
-tet
+asd
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/ORIG_HEAD
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/ORIG_HEAD
@ -1 +0,0 @@
-3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/index
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/index
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD
@ -1,6 +1,3 @@
-0000000000000000000000000000000000000000 2dda1e731d2480710985d15f48ef66502bded67e CI <CI@example.com> 1617321379 +1100	commit (initial): first commit
-2dda1e731d2480710985d15f48ef66502bded67e 7bd286f21691abfba705b80adafcd2b27652de65 CI <CI@example.com> 1617321379 +1100	commit: blah
-7bd286f21691abfba705b80adafcd2b27652de65 7bd286f21691abfba705b80adafcd2b27652de65 CI <CI@example.com> 1617321387 +1100	reset: moving to HEAD
-7bd286f21691abfba705b80adafcd2b27652de65 3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 CI <CI@example.com> 1617321389 +1100	commit: tet
-3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 CI <CI@example.com> 1617321398 +1100	reset: moving to HEAD
-3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 27d069e22427ab361d59dd841b7874820e35baa4 CI <CI@example.com> 1617321401 +1100	commit: tet
+0000000000000000000000000000000000000000 3260dd534b59a53e44813fc97bb49742fb971cdf CI <CI@example.com> 1617587025 +1000	commit (initial): first commit
+3260dd534b59a53e44813fc97bb49742fb971cdf 4d0cf75a1ca408441015baf53e8c745f4157771c CI <CI@example.com> 1617587025 +1000	commit: blah
+4d0cf75a1ca408441015baf53e8c745f4157771c 6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3 CI <CI@example.com> 1617587034 +1000	commit: asd
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master
@ -1,4 +1,3 @@
-0000000000000000000000000000000000000000 2dda1e731d2480710985d15f48ef66502bded67e CI <CI@example.com> 1617321379 +1100	commit (initial): first commit
-2dda1e731d2480710985d15f48ef66502bded67e 7bd286f21691abfba705b80adafcd2b27652de65 CI <CI@example.com> 1617321379 +1100	commit: blah
-7bd286f21691abfba705b80adafcd2b27652de65 3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 CI <CI@example.com> 1617321389 +1100	commit: tet
-3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 27d069e22427ab361d59dd841b7874820e35baa4 CI <CI@example.com> 1617321401 +1100	commit: tet
+0000000000000000000000000000000000000000 3260dd534b59a53e44813fc97bb49742fb971cdf CI <CI@example.com> 1617587025 +1000	commit (initial): first commit
+3260dd534b59a53e44813fc97bb49742fb971cdf 4d0cf75a1ca408441015baf53e8c745f4157771c CI <CI@example.com> 1617587025 +1000	commit: blah
+4d0cf75a1ca408441015baf53e8c745f4157771c 6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3 CI <CI@example.com> 1617587034 +1000	commit: asd
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/04/a465ba74cfb8ff2c118fa9eda3819b7dc53e12
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/04/a465ba74cfb8ff2c118fa9eda3819b7dc53e12
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/1f/8ba169601f0ad7b8279274b486e1def21bb743
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/1f/8ba169601f0ad7b8279274b486e1def21bb743
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/27/d069e22427ab361d59dd841b7874820e35baa4
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/27/d069e22427ab361d59dd841b7874820e35baa4
@ -1,2 +0,0 @@
-x�ÎA
-Â@@Q×sŠìI:fÚ¡«#I3(8¶”<¾õn?oñm©õÑ€2Úæ¥PÔB%ó9bR:å!É,•ÕLSrÒÌa•Í_
¢©wÒ³F*”³±ÆäÅôçgeÌfä ïv_6'¸ŒÓÍ?R×§Ÿl©W D}ìèŒG"Ä°×}ªùŸ<4oááw:z
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/2d/da1e731d2480710985d15f48ef66502bded67e
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/2d/da1e731d2480710985d15f48ef66502bded67e
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/31/1b98b0fa43f6146c7f6c83580f15f4e5c4b117
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/31/1b98b0fa43f6146c7f6c83580f15f4e5c4b117
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/3c/be2a75b31f199c5ac036efcb3b5bdb508ccd05
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/3c/be2a75b31f199c5ac036efcb3b5bdb508ccd05
@ -1,2 +0,0 @@
-xЌО=
-1@aлњ"Ѕ ™ьM"ВV{Њ™d‚‚q—Бг»G°эxЕ+[пП©!›У":xЏ™Сqе$™ЗаЁёVД†VНЎ>©ќ†ј§F®6Еf!f nLh'C•Z©–-Ж`«Д и3ЫРЛЄЇЛz—/хэ%—Іх›†и,ё”хАuи15еП\M™кFЮ9Ћ
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/43/9a6f2a3c627cd37ba1c5eda6a49c26a85ad610
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/43/9a6f2a3c627cd37ba1c5eda6a49c26a85ad610
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c
@ -0,0 +1,2 @@
+x�ÎA
+Ã @Ñ®=…ûBqtÔ¥²Ê1fF%…Ø„`¡Ç¯Gèöñ_öÖ^]C‚K?KÑÆsÈ„"2��8[d¨•$�5¼C1¬:Ë»kgƒÉyûDÞÄ	\•™1E´•SÉUÑ§¯û©çEßçåY¾ÔŽÜdo
¢Ÿ¢±^_Á£†Ž©^þÌo´ªK9[
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/479b73bdb8e9a0b65471ac3fce2a75fd09a048
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/479b73bdb8e9a0b65471ac3fce2a75fd09a048
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/57a1e78421c0c1bf9eb3bcc89f6c0996b9f89e
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/57a1e78421c0c1bf9eb3bcc89f6c0996b9f89e
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/5a/abb4aaf3d6cc113fec7f7a3c0a880988085c23
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/5a/abb4aaf3d6cc113fec7f7a3c0a880988085c23
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/7b/d286f21691abfba705b80adafcd2b27652de65
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/7b/d286f21691abfba705b80adafcd2b27652de65
@ -1,3 +0,0 @@
-x�ÎM
-Â0@a×9Eö‚Ìä·¡«c’™P¡1¥DðøænßâåVë«kœñÒOí|
-L.ç<"9Jl\ÂR(2`Ñ[—!©ƒNywm˜	%Zj‚ˆ0OžÑ7I	ÁƒI,¢(úô�zYõ}YŸò¥zìrË>4ŒÖ �³¾"¨QÇT—?¹J;mêK©9R
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/9f/aac09750995930a5d55eccf91ad6f802e8c66b
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/9f/aac09750995930a5d55eccf91ad6f802e8c66b
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a2/6da4c0b2ff8883e442e4a3195388aba3edf7d7
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a2/6da4c0b2ff8883e442e4a3195388aba3edf7d7
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a8/400d74f22cf90eba9e76bdcc465b25bb9608f2
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a8/400d74f22cf90eba9e76bdcc465b25bb9608f2
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/ff/13bf1f95438acaf2b586ada03b5bccb66e1b95
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/ff/13bf1f95438acaf2b586ada03b5bccb66e1b95
--- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master
+++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master
@ -1 +1 @@
-27d069e22427ab361d59dd841b7874820e35baa4
+6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3
--- a/test/integration/patchBuildingWithFiletree/expected/one/two/file1
+++ b/test/integration/patchBuildingWithFiletree/expected/one/two/file1
@ -1 +0,0 @@
-test5
--- a/test/integration/patchBuildingWithFiletree/expected/one/two/file2
+++ b/test/integration/patchBuildingWithFiletree/expected/one/two/file2
@ -0,0 +1 @@
+test6
--- a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file1
+++ b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file1
@ -1 +0,0 @@
-test1
--- a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file2
+++ b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file2
@ -1 +0,0 @@
-test2
--- a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file4
+++ b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file4
@ -1 +0,0 @@
-test4
--- a/test/integration/patchBuildingWithFiletree/recording.json
+++ b/test/integration/patchBuildingWithFiletree/recording.json
--- a/test/integration/patchBuildingWithFiletree/test.json
+++ b/test/integration/patchBuildingWithFiletree/test.json
@ -1 +1 @@
-{ "description": "messing with our patch building flow in both flat and tree view", "speed": 15 }
+{ "description": "messing with our patch building flow in both flat and tree view", "speed": 10 }