From b6d0bdfa2d09e72050989610d253c4394d3ac6e0 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 2 Apr 2021 10:59:41 +1100 Subject: [PATCH] another integration test --- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../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 -> 583 bytes .../expected/.git_keep/info/exclude | 7 ++++++ .../expected/.git_keep/logs/HEAD | 6 +++++ .../expected/.git_keep/logs/refs/heads/master | 4 ++++ .../04/a465ba74cfb8ff2c118fa9eda3819b7dc53e12 | Bin 0 -> 46 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1f/8ba169601f0ad7b8279274b486e1def21bb743 | Bin 0 -> 75 bytes .../27/d069e22427ab361d59dd841b7874820e35baa4 | 2 ++ .../2d/da1e731d2480710985d15f48ef66502bded67e | Bin 0 -> 122 bytes .../31/1b98b0fa43f6146c7f6c83580f15f4e5c4b117 | Bin 0 -> 45 bytes .../3c/be2a75b31f199c5ac036efcb3b5bdb508ccd05 | 2 ++ .../41/05b6da4ccc191a4abd24b1ffac6a2031534c0b | Bin 0 -> 45 bytes .../44/eb4bd0e7419049a8e4176945786c20dae60d7c | Bin 0 -> 126 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../54/479b73bdb8e9a0b65471ac3fce2a75fd09a048 | Bin 0 -> 45 bytes .../68/bbd52379d849022495dcfd11b13f2fb3103d37 | Bin 0 -> 46 bytes .../7b/d286f21691abfba705b80adafcd2b27652de65 | 3 +++ .../83/90c32b5e687b97e242da46498b574ace0e1eb5 | Bin 0 -> 21 bytes .../98/1651deb012f8e684dd306c1f5bf8edd5c3db67 | Bin 0 -> 106 bytes .../a2/6da4c0b2ff8883e442e4a3195388aba3edf7d7 | Bin 0 -> 80 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a8/400d74f22cf90eba9e76bdcc465b25bb9608f2 | Bin 0 -> 81 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../ff/13bf1f95438acaf2b586ada03b5bccb66e1b95 | Bin 0 -> 45 bytes .../expected/.git_keep/refs/heads/master | 1 + .../expected/one/two/file1 | 1 + .../expected/one/two/three/file1 | 1 + .../expected/one/two/three/file2 | 1 + .../expected/one/two/three/file3 | 1 + .../expected/one/two/three/file4 | 1 + .../patchBuildingWithFiletree/recording.json | 1 + .../patchBuildingWithFiletree/setup.sh | 21 ++++++++++++++++++ .../patchBuildingWithFiletree/test.json | 1 + 41 files changed, 67 insertions(+) create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/HEAD create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/config create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/description create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/index create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/info/exclude create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/04/a465ba74cfb8ff2c118fa9eda3819b7dc53e12 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/1f/8ba169601f0ad7b8279274b486e1def21bb743 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/27/d069e22427ab361d59dd841b7874820e35baa4 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/2d/da1e731d2480710985d15f48ef66502bded67e create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/31/1b98b0fa43f6146c7f6c83580f15f4e5c4b117 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/3c/be2a75b31f199c5ac036efcb3b5bdb508ccd05 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/479b73bdb8e9a0b65471ac3fce2a75fd09a048 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/7b/d286f21691abfba705b80adafcd2b27652de65 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a2/6da4c0b2ff8883e442e4a3195388aba3edf7d7 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a8/400d74f22cf90eba9e76bdcc465b25bb9608f2 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/ff/13bf1f95438acaf2b586ada03b5bccb66e1b95 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master create mode 100644 test/integration/patchBuildingWithFiletree/expected/one/two/file1 create mode 100644 test/integration/patchBuildingWithFiletree/expected/one/two/three/file1 create mode 100644 test/integration/patchBuildingWithFiletree/expected/one/two/three/file2 create mode 100644 test/integration/patchBuildingWithFiletree/expected/one/two/three/file3 create mode 100644 test/integration/patchBuildingWithFiletree/expected/one/two/three/file4 create mode 100644 test/integration/patchBuildingWithFiletree/recording.json create mode 100644 test/integration/patchBuildingWithFiletree/setup.sh create mode 100644 test/integration/patchBuildingWithFiletree/test.json diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..492f47831 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +tet diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuildingWithFiletree/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/HEAD b/test/integration/patchBuildingWithFiletree/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuildingWithFiletree/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..f2b64b43f --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/config b/test/integration/patchBuildingWithFiletree/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/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/patchBuildingWithFiletree/expected/.git_keep/description b/test/integration/patchBuildingWithFiletree/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/index b/test/integration/patchBuildingWithFiletree/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..ee1654e9749d021490b755f41ddb9a4f917d55d1 GIT binary patch literal 583 zcmZ?q402{*U|<4b)`Ya!#mZ_b^)Q-|fq{ih`T08rhQ=if42)laYD9pT&EF(n>gp~{ z@mq?Vk6tbMbboi-M}7w0{Jd2ClJb20w9K4TL!dGS2CzADM>oT0sClo@&0D(X@n6-{ z8($(qqj>V2E(CbBbYEojtw zS0FQ=!BoMJ>%Z`R`Kiubr#@|MTf4wI`pmXG>8ZdV1k153N!?X)e#d_u!TyzR7dOtX zJ!&Tej4H6)qTD41HvR8te&Y0Gv1D+^>cwxrUk3*{gNcFxm&ONp6ObV fqj2jPZ;hSE-!`qK+CNPMLgJTRnDxSag7hZ 1617321379 +1100 commit (initial): first commit +2dda1e731d2480710985d15f48ef66502bded67e 7bd286f21691abfba705b80adafcd2b27652de65 CI 1617321379 +1100 commit: blah +7bd286f21691abfba705b80adafcd2b27652de65 7bd286f21691abfba705b80adafcd2b27652de65 CI 1617321387 +1100 reset: moving to HEAD +7bd286f21691abfba705b80adafcd2b27652de65 3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 CI 1617321389 +1100 commit: tet +3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 CI 1617321398 +1100 reset: moving to HEAD +3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 27d069e22427ab361d59dd841b7874820e35baa4 CI 1617321401 +1100 commit: tet diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..50f5c53f0 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 2dda1e731d2480710985d15f48ef66502bded67e CI 1617321379 +1100 commit (initial): first commit +2dda1e731d2480710985d15f48ef66502bded67e 7bd286f21691abfba705b80adafcd2b27652de65 CI 1617321379 +1100 commit: blah +7bd286f21691abfba705b80adafcd2b27652de65 3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 CI 1617321389 +1100 commit: tet +3cbe2a75b31f199c5ac036efcb3b5bdb508ccd05 27d069e22427ab361d59dd841b7874820e35baa4 CI 1617321401 +1100 commit: tet diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/04/a465ba74cfb8ff2c118fa9eda3819b7dc53e12 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/04/a465ba74cfb8ff2c118fa9eda3819b7dc53e12 new file mode 100644 index 0000000000000000000000000000000000000000..6b047791a85397aca577a1b601cb8ddc19227979 GIT binary patch literal 46 zcmV+}0MY+=0V^p=O;s>9U@$QN0)>+De1=82OAc)M-_iWU>B(Zr;EvUc-+sRi01mVf Ed$#WtJ^%m! literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/patchBuildingWithFiletree/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/patchBuildingWithFiletree/expected/.git_keep/objects/1f/8ba169601f0ad7b8279274b486e1def21bb743 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/1f/8ba169601f0ad7b8279274b486e1def21bb743 new file mode 100644 index 0000000000000000000000000000000000000000..704d49c75a5c236734197a1433b780ae17ec1614 GIT binary patch literal 75 zcmV-R0JQ&j0V^p=O;s>6V=y!@Ff%bxNXyJgHDp-2=kZ_F)Ei$SLZf){oh}4;wRB%a hQeez*Kbu$kOxd$H{HGKSsS9}dYwS8A4FKxP912@MA6WnZ literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/27/d069e22427ab361d59dd841b7874820e35baa4 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/27/d069e22427ab361d59dd841b7874820e35baa4 new file mode 100644 index 000000000..5d1acb5a8 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/27/d069e22427ab361d59dd841b7874820e35baa4 @@ -0,0 +1,2 @@ +xA +@ @QsI:f#I3(8<n?omр2PB%9bR:!,LSra_ wҳF*gef v_6'?RקlWD}G"İ}<4o w:z \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/2d/da1e731d2480710985d15f48ef66502bded67e b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/2d/da1e731d2480710985d15f48ef66502bded67e new file mode 100644 index 0000000000000000000000000000000000000000..616e12d71f922b9dfe61233bc7afcb5ca4efdc15 GIT binary patch literal 122 zcmV-=0EPc}0ga783d0}}0DJZodoPq-qeh{WLQZ*xYgQVl7_5apzkz%p*I|Z9wUo63 zS-SKl0*1Y|OL9ghcETZ|L$QXlUtG}MXBII5jf&s?stu+Y?$i8~Uo6{OZmE_BkfU+X cG>ieRM2Kpq`=rZBUFEfXIvkby0~+-%>+d8vM*si- literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/31/1b98b0fa43f6146c7f6c83580f15f4e5c4b117 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/31/1b98b0fa43f6146c7f6c83580f15f4e5c4b117 new file mode 100644 index 0000000000000000000000000000000000000000..fb08d697cc77f15e03e80cc823daaca9c29d1838 GIT binary patch literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)>+De1;Vcyd|G>e)8>_SGMF6f!f nLh'CZ-`Ġ3˪z/%,u15\MF9 \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b new file mode 100644 index 0000000000000000000000000000000000000000..a35700d0e194beeac2dbf4a54a84aa39ea6a1bc3 GIT binary patch literal 45 zcmb7HexU|FfcPQQAo?oNi}3xy65p<)zlkbB0{5h@|`XOc(rt2 zMN(kIAi?v)s6lDpxtFUJg;({rywaX;p^l`$nBjglulAX;XK(mVDI8K4@bcH#bwnCT gfeFJUlcNv9{}~-CdzJp;w8fXC*jukd0F1skmKlsaH2?qr literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 0000000000000000000000000000000000000000..adf64119a33d7621aeeaa505d30adb58afaa5559 GIT binary patch literal 15 Wcmb{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/479b73bdb8e9a0b65471ac3fce2a75fd09a048 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/479b73bdb8e9a0b65471ac3fce2a75fd09a048 new file mode 100644 index 0000000000000000000000000000000000000000..624910ae999b20d8b05664951334ce56bf37068e GIT binary patch literal 45 zcmbcQN3IJ-f B5}*J8 literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 new file mode 100644 index 0000000000000000000000000000000000000000..15e2a131e84692e3d53bfa3c48d999c254444784 GIT binary patch literal 46 zcmbHR*A?9DejUHPx;=k6GsE9o0-*qn C^b>mk literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/7b/d286f21691abfba705b80adafcd2b27652de65 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/7b/d286f21691abfba705b80adafcd2b27652de65 new file mode 100644 index 000000000..fb97d874a --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/7b/d286f21691abfba705b80adafcd2b27652de65 @@ -0,0 +1,3 @@ +xM +0@a9EcP1DnVkO| +L.<"9Jl\R(2`[!Nywm %Zj0O7I I,(zY}Yzr˭>4֠"QT?J;mK9R \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 new file mode 100644 index 0000000000000000000000000000000000000000..be495f3991a70f570da18905f0d6f17de4d85e73 GIT binary patch literal 21 ccmb#rs)x-b@6iPCH1~Rz3_P+4kaf0WHC*ql|6*&sG Mp7GWI01x&lI9Dz+CjbBd literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a2/6da4c0b2ff8883e442e4a3195388aba3edf7d7 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a2/6da4c0b2ff8883e442e4a3195388aba3edf7d7 new file mode 100644 index 0000000000000000000000000000000000000000..fad0981120498ae136af93626522f212a1b31f27 GIT binary patch literal 80 zcmV-W0I&ae0V^p=O;s>6WiT`_Ff%bxNXyJgHDvHN$(OpiOH=%oBIl!5i$2}o-S&~+ m!~h5sN-}`z8C+g_UwG~~!E?nE@l4l>9EDrYcxwQ_N*vHkb0iS} literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/patchBuildingWithFiletree/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/patchBuildingWithFiletree/expected/.git_keep/objects/a8/400d74f22cf90eba9e76bdcc465b25bb9608f2 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a8/400d74f22cf90eba9e76bdcc465b25bb9608f2 new file mode 100644 index 0000000000000000000000000000000000000000..9bd873ecdec5a145815779135bd68d36548ba322 GIT binary patch literal 81 zcmV-X0IvUd0V^p=O;s>6WiT`_Ff%bxNXyJgHDvHN$(OpiOH=%oBIl!5i$2}o-S&~+ n!~h5sN-}`z8RWYcW+upUUEiTTsbovr!+W2kw>tv>vMC(kdJiP2 literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/patchBuildingWithFiletree/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/patchBuildingWithFiletree/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/patchBuildingWithFiletree/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/patchBuildingWithFiletree/expected/.git_keep/objects/ff/13bf1f95438acaf2b586ada03b5bccb66e1b95 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/ff/13bf1f95438acaf2b586ada03b5bccb66e1b95 new file mode 100644 index 0000000000000000000000000000000000000000..e09245ca9f8462af0d4cc7c61013b92036139b7a GIT binary patch literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)_m%R0ftMsk=(f@A$7H*uV1a;>OvvN9}|F_}>ox Dq=y!< literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master b/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..7a71d7638 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +27d069e22427ab361d59dd841b7874820e35baa4 diff --git a/test/integration/patchBuildingWithFiletree/expected/one/two/file1 b/test/integration/patchBuildingWithFiletree/expected/one/two/file1 new file mode 100644 index 000000000..4f346f1ad --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/one/two/file1 @@ -0,0 +1 @@ +test5 diff --git a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file1 b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file2 b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file3 b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file4 b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/one/two/three/file4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/patchBuildingWithFiletree/recording.json b/test/integration/patchBuildingWithFiletree/recording.json new file mode 100644 index 000000000..ed15d1906 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/recording.json @@ -0,0 +1 @@ +[{"Timestamp":28,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":769,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":993,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1313,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2072,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":96,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YA=="}},{"Timestamp":2761,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2968,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":3305,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":3433,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":3776,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":4193,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":4329,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":4592,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":5224,"Event":{"Type":0,"Mod":0,"Key":16,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"EA=="}},{"Timestamp":5872,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5992,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":6392,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":7169,"Event":{"Type":0,"Mod":0,"Key":65515,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09E"}},{"Timestamp":7369,"Event":{"Type":0,"Mod":0,"Key":65515,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09E"}},{"Timestamp":7888,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":8224,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":8464,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":116,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"dA=="}},{"Timestamp":8504,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":101,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZQ=="}},{"Timestamp":9120,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":9376,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":116,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"dA=="}},{"Timestamp":9464,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":101,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZQ=="}},{"Timestamp":9672,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":116,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"dA=="}},{"Timestamp":9985,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":10937,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":11288,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":11753,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":12425,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":12728,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":13353,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13616,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13864,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":14288,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":15600,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":17192,"Event":{"Type":0,"Mod":0,"Key":16,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"EA=="}},{"Timestamp":17824,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17944,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":18232,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":18696,"Event":{"Type":0,"Mod":0,"Key":65515,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09E"}},{"Timestamp":18800,"Event":{"Type":0,"Mod":0,"Key":65515,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09E"}},{"Timestamp":19207,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":19520,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":20418,"Event":{"Type":0,"Mod":0,"Key":27,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Gw=="}},{"Timestamp":20768,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":21096,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":21312,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":116,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"dA=="}},{"Timestamp":21352,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":101,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZQ=="}},{"Timestamp":21528,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":116,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"dA=="}},{"Timestamp":21720,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":23120,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":113,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cQ=="}}] \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/setup.sh b/test/integration/patchBuildingWithFiletree/setup.sh new file mode 100644 index 000000000..87dc9f6f6 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/setup.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +git commit --allow-empty -m "first commit" + +mkdir -p one/two/three +echo test1 > one/two/three/file1 +echo test2 > one/two/three/file2 +echo test3 > one/two/three/file3 +echo test4 > one/two/three/file4 +echo test5 > one/two/file1 +echo test6 > one/two/file2 + +git add . +git commit -m "blah" diff --git a/test/integration/patchBuildingWithFiletree/test.json b/test/integration/patchBuildingWithFiletree/test.json new file mode 100644 index 000000000..4b58fafdf --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/test.json @@ -0,0 +1 @@ +{ "description": "messing with our patch building flow in both flat and tree view", "speed": 15 }