From 78f17aa541d8e072bbf546993bf6252e8542a094 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 5 Apr 2021 11:50:15 +1000 Subject: [PATCH] update squash integration test --- .../squash/expected/.git_keep/COMMIT_EDITMSG | 10 ++++----- .../squash/expected/.git_keep/ORIG_HEAD | 2 +- .../squash/expected/.git_keep/index | Bin 425 -> 425 bytes .../squash/expected/.git_keep/logs/HEAD | 20 +++++++++--------- .../expected/.git_keep/logs/refs/heads/master | 12 +++++------ .../07/1c49e226b0040e0ecc3494417193357104914d | Bin 0 -> 210 bytes .../07/cf881fb6557a9676ff388420433cf375a3565e | Bin 0 -> 148 bytes .../0c/6aed66ccd076086011a0e68bf67e3477cd5e1d | Bin 119 -> 0 bytes .../11/0df011cb4464ac4073580e252abd1148e4d1b3 | Bin 0 -> 147 bytes .../20/e23116605fc77c1452a0834277e7f1f07c4c22 | Bin 0 -> 148 bytes .../35/bf02987e13a6d711d4279778063e72dd051680 | Bin 150 -> 0 bytes .../47/e0e1f091e2be405f3e23e75eede4f6e392eda3 | Bin 0 -> 154 bytes .../51/a88edd955132342caad6512e92d25164b5f7d3 | 2 -- .../5e/f618ee84d1fbb6f277996061996ce5ec0faf4e | 3 --- .../75/afa841946755c424097363ba4e5682951b02e3 | Bin 211 -> 0 bytes .../ac/0b81af0c436000141d41d6bfbf61fe41567eca | Bin 149 -> 0 bytes .../b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa | Bin 0 -> 150 bytes .../db/27c30903c7fa6564e9c925097a03b88e6b67e7 | Bin 149 -> 0 bytes .../e1/1ec0e7a753a2cc10e348948173064e17d127d6 | 2 ++ .../expected/.git_keep/refs/heads/master | 2 +- test/integration/squash/recording.json | 2 +- 21 files changed, 26 insertions(+), 29 deletions(-) create mode 100644 test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d create mode 100644 test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e delete mode 100644 test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d create mode 100644 test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3 create mode 100644 test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22 delete mode 100644 test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680 create mode 100644 test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 delete mode 100644 test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 delete mode 100644 test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e delete mode 100644 test/integration/squash/expected/.git_keep/objects/75/afa841946755c424097363ba4e5682951b02e3 delete mode 100644 test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca create mode 100644 test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa delete mode 100644 test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 create mode 100644 test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 diff --git a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG index 01a9c0330..877ad0ddb 100644 --- a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG @@ -14,14 +14,14 @@ myfile3 # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# Date: Tue Oct 6 21:47:36 2020 +1100 +# Date: Mon Apr 5 11:49:51 2021 +1000 # -# interactive rebase in progress; onto 0c6aed6 +# interactive rebase in progress; onto e11ec0e # Last commands done (4 commands done): -# drop 35bf029 myfile4 -# fixup 51a88ed myfile5 +# drop 110df01 myfile4 +# fixup 07cf881 myfile5 # No commands remaining. -# You are currently rebasing branch 'master' on '0c6aed6'. +# You are currently rebasing branch 'master' on 'e11ec0e'. # # Changes to be committed: # new file: myfile2 diff --git a/test/integration/squash/expected/.git_keep/ORIG_HEAD b/test/integration/squash/expected/.git_keep/ORIG_HEAD index 93c77382b..cbe313f37 100644 --- a/test/integration/squash/expected/.git_keep/ORIG_HEAD +++ b/test/integration/squash/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -ac0b81af0c436000141d41d6bfbf61fe41567eca +b19c1df5dc3e523e78444cbaa07a81a89f19a4aa diff --git a/test/integration/squash/expected/.git_keep/index b/test/integration/squash/expected/.git_keep/index index c94c1469cb4eb84ee4d6c35fa836c2444d405bd6..d085b3efb838d3b3a202b9252d4fe0f113a0b43f 100644 GIT binary patch delta 149 zcmZ3Q@E#}!rlE5F6SqL+A{^VmazGj?7d!FKOp%|deJ>`7oo1V4SjTx)a((B_ I%`5%_0HY>10RR91 delta 149 zcmZ3otyY)rpSWyZjqnwf=W)$_uZlX>VLM@ HecR;#cpNn8 diff --git a/test/integration/squash/expected/.git_keep/logs/HEAD b/test/integration/squash/expected/.git_keep/logs/HEAD index 7d1bab2af..f43c62dc8 100644 --- a/test/integration/squash/expected/.git_keep/logs/HEAD +++ b/test/integration/squash/expected/.git_keep/logs/HEAD @@ -1,10 +1,10 @@ -0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981256 +1100 commit (initial): myfile1 -0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981256 +1100 commit: myfile2 -ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI 1601981256 +1100 commit: myfile3 -db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI 1601981256 +1100 commit: myfile4 -35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI 1601981256 +1100 commit: myfile5 -51a88edd955132342caad6512e92d25164b5f7d3 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981258 +1100 rebase -i (start): checkout 0c6aed66ccd076086011a0e68bf67e3477cd5e1d -0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981258 +1100 rebase -i: fast-forward -ac0b81af0c436000141d41d6bfbf61fe41567eca 75afa841946755c424097363ba4e5682951b02e3 CI 1601981262 +1100 rebase -i (squash): # This is a combination of 2 commits. -75afa841946755c424097363ba4e5682951b02e3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (fixup): myfile2 -5ef618ee84d1fbb6f277996061996ce5ec0faf4e 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (finish): returning to refs/heads/master +0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587391 +1000 commit (initial): myfile1 +e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587391 +1000 commit: myfile2 +b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI 1617587391 +1000 commit: myfile3 +20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI 1617587391 +1000 commit: myfile4 +110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI 1617587391 +1000 commit: myfile5 +07cf881fb6557a9676ff388420433cf375a3565e e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587392 +1000 rebase -i (start): checkout e11ec0e7a753a2cc10e348948173064e17d127d6 +e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587392 +1000 rebase -i: fast-forward +b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 071c49e226b0040e0ecc3494417193357104914d CI 1617587395 +1000 rebase -i (squash): # This is a combination of 2 commits. +071c49e226b0040e0ecc3494417193357104914d 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (fixup): myfile2 +47e0e1f091e2be405f3e23e75eede4f6e392eda3 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/squash/expected/.git_keep/logs/refs/heads/master b/test/integration/squash/expected/.git_keep/logs/refs/heads/master index adbf39bb5..ef591b30e 100644 --- a/test/integration/squash/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/squash/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981256 +1100 commit (initial): myfile1 -0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981256 +1100 commit: myfile2 -ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI 1601981256 +1100 commit: myfile3 -db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI 1601981256 +1100 commit: myfile4 -35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI 1601981256 +1100 commit: myfile5 -51a88edd955132342caad6512e92d25164b5f7d3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (finish): refs/heads/master onto 0c6aed66ccd076086011a0e68bf67e3477cd5e1d +0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587391 +1000 commit (initial): myfile1 +e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587391 +1000 commit: myfile2 +b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI 1617587391 +1000 commit: myfile3 +20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI 1617587391 +1000 commit: myfile4 +110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI 1617587391 +1000 commit: myfile5 +07cf881fb6557a9676ff388420433cf375a3565e 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (finish): refs/heads/master onto e11ec0e7a753a2cc10e348948173064e17d127d6 diff --git a/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d b/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d new file mode 100644 index 0000000000000000000000000000000000000000..bf6740609ae67442ace9bcdd18503405d5507a2d GIT binary patch literal 210 zcmV;@04@J`0fmmiN(30PU;l4(`8yg-`oi4a6n{ z)I!!DtnV57)dq8q%U1HwIOtyNF^Q%(NC zha0YT@Vul7eHi-flvZx3tWYAD&!Efd{uk920j%v-L6%ziMUG14_n0nX)F1Xs@y)@` M{Gg;h0O{dhyY<^>-v9sr literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e b/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e new file mode 100644 index 0000000000000000000000000000000000000000..462faf5e89d692c9c0b8b4cfbd1b29d118ecf11f GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeKzJ-82zIgr540O|rp4V@rvkzqe2DI?TZ2wY9lh zyz;5oCK_VzyNv zmP z9Qf3CGfy?5G6;kO98yJoV2qM-kZ2l-gOn@-x-IYa>Yl(T;GuxjqFRuJGNizyYFe>^ z7A{0Czx#9D{W$sSINj}&+qT%HtnKFUNJ`Q$pg$u3xPu;3-Tu^F`__3ec0X5p=yT=0VR&G6hbUaSPCzIB|3>2VG!RbYIZ*K)og|&z4eQr`T;dWB9hGP0!QGO z3M3|G!|(Rk4m-{EI?Z?eaNVDJk*(e=j1YVbn82RFIcK`W zjnSRPE}~6k^bQDY0B1u*mywx5vc%%qI7=l_M75<|UPC{!@x?*}TYODS>?D?G2%=A5 za|ptjy?B-07-83>_3}}e;84*Ao^_Uv+Cs*xTmsOnl0k45L Eb5W>B-v9sr diff --git a/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 b/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 new file mode 100644 index 0000000000000000000000000000000000000000..7418a5b13e759e42f053bc1cb941ce858f9e2308 GIT binary patch literal 154 zcmV;L0A>Gp0fml13d0}}0DJZo-V4Qb)m12^kW-#v*Odlh6M}{I_st>q-iBcg!%J&Z z*Vf>vZz38V5o4(d1!62Eb7e_T43^3jFb2+^2%K8;CaKUTpUb9)QD2AgE}z`iSuVV^n}z`7BVhu424jrc?LO7zPwtOgwQrqfvFZR+ IKN(;>8D!8zwEzGB literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 b/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 deleted file mode 100644 index faddde627..000000000 --- a/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] 2ɯ "tcL [Jnkks8SE4cfkLƺsMRŰ%J65T 15a!'%GPu㤯t7mK^M"@ڧ΋8:' \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e b/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e deleted file mode 100644 index 871b5bdc9..000000000 --- a/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e +++ /dev/null @@ -1,3 +0,0 @@ -x}A -0E] 2Ӵ)] ƖAoo]{|އ'K)s S13uSipavA_U;d4IvpplnJkkm=-(T074aYx zG*rJTic8L^fkl1SHW4s0PL>^Eh=aA!4>m?0&_<`(%@z%h{j#Ww-(+o|nY;ud=Ab9i zjx?gzLT-*Ui5;ei!zdV(zqX}pa6G}&@pO$=Xy1?tf8j5y0ARFUV4>f0ak2@_S5YG3pQdRq@Ti N&itTOeE^I%U~5NgX_Wu~ diff --git a/test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca b/test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca deleted file mode 100644 index 0e42ce6545fc3d60c647e103cbe120bfaafb50a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93d0~21-teX?hECAW1b436tc=OjDBe#HX&GOZ{HlD+hGPKZM7~< zbFi0oi0J4#%droIauz88K@iG}4&DISn3;;P47JBYUQJU%lnkVl$$>nGIg-H71x`Ba zT*|$0R`K1Q+o8uv599QZPptbYx3tx}<}(VOO%Hu#CQ>Ior<(k!tNJa=Dn|VP-uOCA DgUCjn diff --git a/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa b/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa new file mode 100644 index 0000000000000000000000000000000000000000..7d8b697786bc5ddb090a0dabef7c281833a6c413 GIT binary patch literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQTsByQ)p>1ExVLl%iUNL`mvQo}wcv&dpF=Kr&m}_0_E+Y6j)RgHJAJ1oa_Gh{zr& zC~`r^g-m+)$GY2bve$9C>nFACsh7OAn?*t%B6~r5MgTBJJ*K+;$xZv#<*Cm60E_!M EmK+^S_5c6? literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 b/test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 deleted file mode 100644 index 7ce662ad9dc7990dd4e0f276f5fa979d4290ff62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fDMP26<*$Xn$Nz(`-LRUS;WIBU|#+DL6Z*Ptue0cD9i!WO# zOZ9jSr+TRRF5^IwBF+|wj02hRjARKUWx`JSMp3u(p|9#$ASYx42^0YU1I}$RTegU% z0sAiu