From 795cf39ddf5f9116e28c8eca332648eaedd8441e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 5 Apr 2021 11:35:10 +1000 Subject: [PATCH] update patch building test --- .../expected/.git_keep/ORIG_HEAD | 2 +- .../patchBuilding/expected/.git_keep/index | Bin 281 -> 281 bytes .../expected/.git_keep/logs/HEAD | 20 +++++++++--------- .../expected/.git_keep/logs/refs/heads/master | 12 +++++------ .../19/c35a6c6e60aead9beb704c336f95a9c34eb272 | Bin 119 -> 0 bytes .../23/22f6373956d9d54470640e71ff258d609c61bd | Bin 149 -> 0 bytes .../29/f276b162bc253add87f21f45013cbce86c4ab0 | Bin 0 -> 154 bytes .../51/d06e68d1780c3af5ec14e8a8a6250693dea430 | Bin 147 -> 0 bytes .../5b/64b56ce78c5611173e73ee34cf0eb6fddac926 | Bin 0 -> 150 bytes .../5c/021eb54f0eac90e22f363ee9214454a55b81de | 2 ++ .../84/166fe7febd3d82c087a5261a34a5e0dabeebbc | Bin 154 -> 0 bytes .../a2/96781a25a5bd97a0024744488d9ba39189bf19 | Bin 154 -> 0 bytes .../a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 | 2 ++ .../aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c | Bin 0 -> 149 bytes .../ab/e7653e9667153c8086f477217f8fb571731132 | Bin 150 -> 0 bytes .../ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f | Bin 158 -> 0 bytes .../cc/25737e7c56a583e7f22d97c66f304e90689206 | Bin 0 -> 158 bytes .../ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 | Bin 0 -> 152 bytes .../expected/.git_keep/refs/heads/master | 2 +- test/integration/patchBuilding/recording.json | 2 +- test/integration/patchBuilding/test.json | 2 +- 21 files changed, 24 insertions(+), 20 deletions(-) delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/19/c35a6c6e60aead9beb704c336f95a9c34eb272 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/51/d06e68d1780c3af5ec14e8a8a6250693dea430 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/5b/64b56ce78c5611173e73ee34cf0eb6fddac926 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/5c/021eb54f0eac90e22f363ee9214454a55b81de delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/84/166fe7febd3d82c087a5261a34a5e0dabeebbc delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 diff --git a/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD index b4ae72d05..d0df06fd0 100644 --- a/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD +++ b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -84166fe7febd3d82c087a5261a34a5e0dabeebbc +29f276b162bc253add87f21f45013cbce86c4ab0 diff --git a/test/integration/patchBuilding/expected/.git_keep/index b/test/integration/patchBuilding/expected/.git_keep/index index 2a202a2bdf5a567abad4c91f981cb6b6880d900d..38bcf88c7964a319519f1005e149831b721919b4 100644 GIT binary patch delta 121 zcmbQqG?Pii#WTp6fq{Vuh?x_zGI@1a=In;ij0_AcY??hUCaM@n0L6qAR1dhqXoy^I t)5IKzoV-a^A4m>FL*;TNZV425=6PD{m-hkFZvyk*Z+jY&$&xIq0|0+RBv1eV delta 121 zcmbQqG?Pii#WTp6fq{Vuh?(PSy#1|}eT!i(f|Me diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding/expected/.git_keep/logs/HEAD index beea0368f..561ac2a79 100644 --- a/test/integration/patchBuilding/expected/.git_keep/logs/HEAD +++ b/test/integration/patchBuilding/expected/.git_keep/logs/HEAD @@ -1,10 +1,10 @@ -0000000000000000000000000000000000000000 19c35a6c6e60aead9beb704c336f95a9c34eb272 CI 1601981264 +1100 commit (initial): myfile1 -19c35a6c6e60aead9beb704c336f95a9c34eb272 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981264 +1100 commit: myfile2 -2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981264 +1100 commit: myfile2 update -84166fe7febd3d82c087a5261a34a5e0dabeebbc abe7653e9667153c8086f477217f8fb571731132 CI 1601981264 +1100 commit: myfile3 -abe7653e9667153c8086f477217f8fb571731132 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981269 +1100 rebase -i (start): checkout 2322f6373956d9d54470640e71ff258d609c61bd -2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981269 +1100 rebase -i: fast-forward -84166fe7febd3d82c087a5261a34a5e0dabeebbc ac3b4dc17422ff4d64f08195e8d6fae5f61d213f CI 1601981270 +1100 commit (amend): myfile2 update -ac3b4dc17422ff4d64f08195e8d6fae5f61d213f a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (pick): myfile3 -a296781a25a5bd97a0024744488d9ba39189bf19 a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (finish): returning to refs/heads/master -a296781a25a5bd97a0024744488d9ba39189bf19 51d06e68d1780c3af5ec14e8a8a6250693dea430 CI 1601981271 +1100 commit: test +0000000000000000000000000000000000000000 5c021eb54f0eac90e22f363ee9214454a55b81de CI 1617586445 +1000 commit (initial): myfile1 +5c021eb54f0eac90e22f363ee9214454a55b81de aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586445 +1000 commit: myfile2 +aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586445 +1000 commit: myfile2 update +29f276b162bc253add87f21f45013cbce86c4ab0 5b64b56ce78c5611173e73ee34cf0eb6fddac926 CI 1617586445 +1000 commit: myfile3 +5b64b56ce78c5611173e73ee34cf0eb6fddac926 aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586451 +1000 rebase -i (start): checkout aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c +aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586451 +1000 rebase -i: fast-forward +29f276b162bc253add87f21f45013cbce86c4ab0 cc25737e7c56a583e7f22d97c66f304e90689206 CI 1617586451 +1000 commit (amend): myfile2 update +cc25737e7c56a583e7f22d97c66f304e90689206 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (pick): myfile3 +ef37d114b15acc27c17e75fa36ccfa1e50e913a8 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (finish): returning to refs/heads/master +ef37d114b15acc27c17e75fa36ccfa1e50e913a8 a3f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 CI 1617586454 +1000 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master index e30bae310..0f186d9f1 100644 --- a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 19c35a6c6e60aead9beb704c336f95a9c34eb272 CI 1601981264 +1100 commit (initial): myfile1 -19c35a6c6e60aead9beb704c336f95a9c34eb272 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981264 +1100 commit: myfile2 -2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981264 +1100 commit: myfile2 update -84166fe7febd3d82c087a5261a34a5e0dabeebbc abe7653e9667153c8086f477217f8fb571731132 CI 1601981264 +1100 commit: myfile3 -abe7653e9667153c8086f477217f8fb571731132 a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (finish): refs/heads/master onto 2322f6373956d9d54470640e71ff258d609c61bd -a296781a25a5bd97a0024744488d9ba39189bf19 51d06e68d1780c3af5ec14e8a8a6250693dea430 CI 1601981271 +1100 commit: test +0000000000000000000000000000000000000000 5c021eb54f0eac90e22f363ee9214454a55b81de CI 1617586445 +1000 commit (initial): myfile1 +5c021eb54f0eac90e22f363ee9214454a55b81de aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586445 +1000 commit: myfile2 +aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586445 +1000 commit: myfile2 update +29f276b162bc253add87f21f45013cbce86c4ab0 5b64b56ce78c5611173e73ee34cf0eb6fddac926 CI 1617586445 +1000 commit: myfile3 +5b64b56ce78c5611173e73ee34cf0eb6fddac926 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (finish): refs/heads/master onto aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c +ef37d114b15acc27c17e75fa36ccfa1e50e913a8 a3f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 CI 1617586454 +1000 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/19/c35a6c6e60aead9beb704c336f95a9c34eb272 b/test/integration/patchBuilding/expected/.git_keep/objects/19/c35a6c6e60aead9beb704c336f95a9c34eb272 deleted file mode 100644 index 354216f854c14629387dbff136c70cfc89aba9e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10ga783WG2Z0DI0W_FgDiyIms`DR}Z3YqFt&OGHwzzi*z<>oCK_VzyR5 z;!8bL!7In?g_nNNkcbomr+}Sc?rEWWV#*R9os&;}mjk95p40r&Q*7V#7K@F5>~Uxf Z6I>C!ca645)jxG--@I;$?gucZEXBJ!II{o% diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd b/test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd deleted file mode 100644 index b65def31c1eff16cb82db1d8d96b0bf1e7af47a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAL3c@fDMqTF=*$XoHn}4`q-`o_f)hI({QM2GafBHeftX56oIKcU4A$sq zSj$O!E$G!B+aae}UZ?raZ)*F>m%O!`R0t{trP0c>QUGGmajNs5xoDrdtgOWs3FJDO Dwd+Lc diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 b/test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 new file mode 100644 index 0000000000000000000000000000000000000000..e2b671e92c88a856837b312082b3032f680cd40b GIT binary patch literal 154 zcmV;L0A>Gp0gcX03WG2ZK;f=)itGzzjFTUsl!7adF`3Lz!Bmk5?d|Ikx_x|$$7`)~ zvktmT+eIu3I8+V;YQcc4*=OuI#|Ta#m)N5(DLJ#zF7IZEoS-VF#Hik5iWIY#1OsSD zqLiJI3vB3UuXVTMWbfnjln>QyksGh|VY|>pp8}${*A4*8Sy9HMRxMB`?~vS_Tx0)^eb(9>Lsu3>Tv+%gn`hX5dqv$k15kXxifv6`vKxRIF^ZMB@}DK2QZE* zaf;+i1y$bTvF>`B^>v!>{3(5V@`cuZ(M=F=PpNOý$ÛV½äf ¡à£0{8"º£“®rgߺ¬Jî3‡,Õ \ No newline at end of file diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/84/166fe7febd3d82c087a5261a34a5e0dabeebbc b/test/integration/patchBuilding/expected/.git_keep/objects/84/166fe7febd3d82c087a5261a34a5e0dabeebbc deleted file mode 100644 index 8fd7f17986532afa5c51253299c51c4585d208ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0gaAJ3c@fDKwak)*$Xn6OePJ82wn9U`Ao3T*iur^+uI|!eY^)RudU5p zBbZCyMRXQGs+j}TLQJ_Pm&oSiJz#}Yyd_tL0o4|Fd7q(0tZcmvj!P(x$O99IH?^W0 z3PZ?jQc>~fuXWesr0?VOluvBiBDcJ@hc*l*3)ffPE(sQcIpSo(_Ixm9y*h=i8 Iejpk=COz~>vH$=8 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 b/test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 deleted file mode 100644 index 60be6d23072a2ae96c74fc81cba5fc373aed6494..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0e#L*3c@fDKw;N8MfQTsWYYYAh|pD!k!B`XXlw})^!9e)+U?_8yu8)A zbdAxTdK1w?gfIX($}+=@h9iSDLO%G&AsPY6fGBZ;traE>6>R_C2av<8uo ziBd2{6u%83M!)<@cC2#GfjW-hoKXQFG0H6jPQ(gYdRr}WUDOUXe*6TVw DVP#5A literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 b/test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 deleted file mode 100644 index 0f1f37286b5f9c5eba5d06e7c3ffaf8dc774271d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW}3c@fHMq$TUMdpIso1}Swh|p1&ahv?Xg0ZDU(B0c5I6ZuWlh@Xk zt~t3=-vKSw)I?Hh0I0GPSR%NTON}9yGQ}W+@hsNK z04g#A^PH8u`(xepIO*#+-SLsOJ#oovyJ_~sDYEfSpP7l&QIDyPKe=k(x;$ak4@l}e EFSTP%%>V!Z diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f b/test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f deleted file mode 100644 index 30cb044bf31246e657085f705e0be4fcddab8183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0ey}^3c@fDMP26<*$Xn0NhS@52wn9UF_~bYv8AM-w>JydZrJ^*HJ4INjwP>$b=xt@Wmn0mFcXtv(|HsJ`~7CjWI0KV8*NnHMqo M*m7*5zDmS94qVwwo&W#< diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 b/test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 new file mode 100644 index 0000000000000000000000000000000000000000..0740abfde9f5d93c027a4457f7f6abec381baa22 GIT binary patch literal 158 zcmV;P0Ac@l0ez0K3c@fDK%Mgy*#*fZx#S8WLZ^PlHNC@vv8AM-e{Tn8mp44#@XAu_ z+^lzSYMY34fQh;Q!RLcex`0VI=oFGC&7p7<&RsSuZ}MuE*-KO{L?tR>q|A9lA=f!g zB+8>#_Nf@&+hf^mKiF$O+~v)6eafXQ^=2VKMoKZFJ%e-39QK%M@;^uT<)(ggeu}sI MI&l;81u|GX&;Bt^I{*Lx literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 b/test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 new file mode 100644 index 0000000000000000000000000000000000000000..e66271bda52ada9cbe20342e8bc717ef923a611a GIT binary patch literal 152 zcmV;J0B8Sr0ey}^3d0}}0DJZo-V0@QbyuO3LQZ*x(G3m6CIk!Z@9UxGUWXZ&yw$oi zZK6B1LqrRr0S`!+WrE4r5(_vh$bn-C(Uw3g3Dlkrc{ZK1^^7c>JtZGdc(%RaOf(}n zi9kI9Qt8zm+o6Y1Ux)E7?^O3yE_tgrZOE_>