From f4ddf2f0d4be4ccc7efacca2ba81e4a6d46b6318 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 26 Jan 2022 09:08:05 +1100 Subject: [PATCH] redo commit revert integration test --- .../expected/.git_keep/COMMIT_EDITMSG | 2 +- .../commitsRevert/expected/.git_keep/HEAD | 2 +- .../commitsRevert/expected/.git_keep/index | Bin 209 -> 279 bytes .../commitsRevert/expected/.git_keep/logs/HEAD | 9 +++++---- .../expected/.git_keep/logs/refs/heads/master | 8 +++++--- .../.git_keep/logs/refs/heads/newbranch | 1 - .../08/42967ae6f16d85995f718922256cea03d10b4e | 2 -- .../17/27eeb6864e52a8967a1a494099359dbdfcc235 | Bin 0 -> 147 bytes .../3a/1ee58e5736049ad5b9266715d3642614816c1f | 2 ++ .../3e/9204493881a93d230aa85233c4721b6e83268d | 3 --- .../59/2b94b2f4dc9b7831efbd76f711f6232448730e | 2 -- .../7e/03c9a9538a907c936de5c9a2154707b9ee541c | 4 ++++ .../9e/aae8f342ca71c060b760870a715a6303905935 | Bin 0 -> 118 bytes .../ab/15072795e72a2061bc40060494c3ca2138b297 | Bin 0 -> 196 bytes .../b7/81ffd3aa940dde39f73c9149b67e2b128de085 | 2 ++ .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/refs/heads/newbranch | 1 - test/integration/commitsRevert/expected/file1 | 1 - test/integration/commitsRevert/expected/file2 | 1 + test/integration/commitsRevert/recording.json | 2 +- 20 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch delete mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f delete mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/3e/9204493881a93d230aa85233c4721b6e83268d delete mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/59/2b94b2f4dc9b7831efbd76f711f6232448730e create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 create mode 100644 test/integration/commitsRevert/expected/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 delete mode 100644 test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch delete mode 100644 test/integration/commitsRevert/expected/file1 create mode 100644 test/integration/commitsRevert/expected/file2 diff --git a/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG index 6c493ff74..a04a59a53 100644 --- a/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG @@ -1 +1 @@ -file2 +revert commit diff --git a/test/integration/commitsRevert/expected/.git_keep/HEAD b/test/integration/commitsRevert/expected/.git_keep/HEAD index a9a1d2137..cb089cd89 100644 --- a/test/integration/commitsRevert/expected/.git_keep/HEAD +++ b/test/integration/commitsRevert/expected/.git_keep/HEAD @@ -1 +1 @@ -ref: refs/heads/newbranch +ref: refs/heads/master diff --git a/test/integration/commitsRevert/expected/.git_keep/index b/test/integration/commitsRevert/expected/.git_keep/index index 9ce0d669e725e71e5d48b10ed690a50614e1fd43..fabd517d85e3c8692aa194062825870606c948d7 100644 GIT binary patch literal 279 zcmZ?q402{*U|<5_#1F+sb(T&n1ku{&3Wkgf46ICQ?2QZzjY}997{3D5hyXF0g^1Oa z1^=|Ry$e3{zH{l#M|-E5-eO=)%gjkN07^43fb{F}1~`MwTesF1YEBcnITAcSj2e{o zoqM@zQFv8<%PZ~q7U~dljKJoE1i88b8IlY}3I<$Oa!>oh%~)n#-Kmx?dO1Z+q%lW6 z$Tbw?csr2Qh75)V24*HEFv@^o>7K`bRa0+#i3pA2$#=RC;MLN76`R7K`bRa0+#i3pA2$#=RC;MLN7m4P)aGbhy$D9ykS66ER%q$C-P y6b!g7l%1J#VAiQcm-F{jP5o=9%;xFlINj*R?aiCJLoA<4=gC+uy0Jtew+aA&nK}^w diff --git a/test/integration/commitsRevert/expected/.git_keep/logs/HEAD b/test/integration/commitsRevert/expected/.git_keep/logs/HEAD index f477d1f97..d82a2c6a4 100644 --- a/test/integration/commitsRevert/expected/.git_keep/logs/HEAD +++ b/test/integration/commitsRevert/expected/.git_keep/logs/HEAD @@ -1,4 +1,5 @@ -0000000000000000000000000000000000000000 3e9204493881a93d230aa85233c4721b6e83268d CI 1617674261 +1000 commit (initial): file0 -3e9204493881a93d230aa85233c4721b6e83268d 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674261 +1000 commit: file1 -592b94b2f4dc9b7831efbd76f711f6232448730e 0842967ae6f16d85995f718922256cea03d10b4e CI 1617674261 +1000 commit: file2 -0842967ae6f16d85995f718922256cea03d10b4e 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674264 +1000 checkout: moving from master to newbranch +0000000000000000000000000000000000000000 9eaae8f342ca71c060b760870a715a6303905935 CI 1643148217 +1100 commit (initial): file0 +9eaae8f342ca71c060b760870a715a6303905935 1727eeb6864e52a8967a1a494099359dbdfcc235 CI 1643148217 +1100 commit: file1 +1727eeb6864e52a8967a1a494099359dbdfcc235 b781ffd3aa940dde39f73c9149b67e2b128de085 CI 1643148217 +1100 commit: file2 +b781ffd3aa940dde39f73c9149b67e2b128de085 ab15072795e72a2061bc40060494c3ca2138b297 CI 1643148219 +1100 revert: Revert "file1" +ab15072795e72a2061bc40060494c3ca2138b297 7e03c9a9538a907c936de5c9a2154707b9ee541c CI 1643148227 +1100 commit (amend): revert commit diff --git a/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master b/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master index 42c7cd4a3..d82a2c6a4 100644 --- a/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master @@ -1,3 +1,5 @@ -0000000000000000000000000000000000000000 3e9204493881a93d230aa85233c4721b6e83268d CI 1617674261 +1000 commit (initial): file0 -3e9204493881a93d230aa85233c4721b6e83268d 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674261 +1000 commit: file1 -592b94b2f4dc9b7831efbd76f711f6232448730e 0842967ae6f16d85995f718922256cea03d10b4e CI 1617674261 +1000 commit: file2 +0000000000000000000000000000000000000000 9eaae8f342ca71c060b760870a715a6303905935 CI 1643148217 +1100 commit (initial): file0 +9eaae8f342ca71c060b760870a715a6303905935 1727eeb6864e52a8967a1a494099359dbdfcc235 CI 1643148217 +1100 commit: file1 +1727eeb6864e52a8967a1a494099359dbdfcc235 b781ffd3aa940dde39f73c9149b67e2b128de085 CI 1643148217 +1100 commit: file2 +b781ffd3aa940dde39f73c9149b67e2b128de085 ab15072795e72a2061bc40060494c3ca2138b297 CI 1643148219 +1100 revert: Revert "file1" +ab15072795e72a2061bc40060494c3ca2138b297 7e03c9a9538a907c936de5c9a2154707b9ee541c CI 1643148227 +1100 commit (amend): revert commit diff --git a/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch b/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch deleted file mode 100644 index 16b1076b3..000000000 --- a/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/newbranch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 592b94b2f4dc9b7831efbd76f711f6232448730e CI 1617674264 +1000 branch: Created from 592b94b2f4dc9b7831efbd76f711f6232448730e diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e b/test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e deleted file mode 100644 index 932545521..000000000 --- a/test/integration/commitsRevert/expected/.git_keep/objects/08/42967ae6f16d85995f718922256cea03d10b4e +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] ]`DnǫۺBK?DlLUna֢mp@QX}X͞yw;$,)j*DK=䝘do^Enu[♧sT?u"h~R9 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 b/test/integration/commitsRevert/expected/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 new file mode 100644 index 0000000000000000000000000000000000000000..59a43062417fc529602610bcd28cbe4aee322cab GIT binary patch literal 147 zcmV;E0Brww0ga9^3d1lA06Y5?-U~&tY&nKf3Yqc@MUiPBX+m(J&u^a4@s1l#w{@MH z#}Y2>F!K{+RxPSfL`A|xTu04PQk}>G0ml+KqTA)Lck{(Wtg94*N=5~SF*9@-PD;WA zR3H^fPCo6m9ljs@y&sB$GBCH\#t붮sP3_CbբVi$*RX"Gpn`P )DrDȖ 9W'Oʺ/vm}x`H"2+Yϩfr7͋8 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c b/test/integration/commitsRevert/expected/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c new file mode 100644 index 000000000..fea4aa6be --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c @@ -0,0 +1,4 @@ +x}K +1]$O'AY1`!DmQxym6@IytDf:M҄Xl +ȡ-"4)c[Z1Y +PMHX%TV縮y;Χ3 * pDRt?5O_|3< \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 b/test/integration/commitsRevert/expected/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 new file mode 100644 index 0000000000000000000000000000000000000000..dfcaf39be7ad3008ab5b768e9c6dafa58fbf03d6 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NynrC5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lDl^?3&3M4TG*ysY=8z;YvQNB+draXN^O YRyZA_d9s0}#lns#VQij)BMcd-VmEggdYe#E#@?G3;b2=+&pr9d z7`RYUSJ36AHb*0$^Rf*%o#Ewle$#JR?^iw6ZG8o#;P5_K{m@y;kSr(fj}-p-ugO6=84y literal 0 HcmV?d00001 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 b/test/integration/commitsRevert/expected/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 new file mode 100644 index 000000000..c32d4b681 --- /dev/null +++ b/test/integration/commitsRevert/expected/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 @@ -0,0 +1,2 @@ +xK +0@] & "tcL [Jo /I8Z֊r@ " F"9Pp).9JAk;44?}_VGQ_Q'=\9 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/.git_keep/refs/heads/master b/test/integration/commitsRevert/expected/.git_keep/refs/heads/master index 8cebe1d71..7edf473fd 100644 --- a/test/integration/commitsRevert/expected/.git_keep/refs/heads/master +++ b/test/integration/commitsRevert/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -0842967ae6f16d85995f718922256cea03d10b4e +7e03c9a9538a907c936de5c9a2154707b9ee541c diff --git a/test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch b/test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch deleted file mode 100644 index dd2e9bde8..000000000 --- a/test/integration/commitsRevert/expected/.git_keep/refs/heads/newbranch +++ /dev/null @@ -1 +0,0 @@ -592b94b2f4dc9b7831efbd76f711f6232448730e diff --git a/test/integration/commitsRevert/expected/file1 b/test/integration/commitsRevert/expected/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/commitsRevert/expected/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/commitsRevert/expected/file2 b/test/integration/commitsRevert/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/commitsRevert/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/commitsRevert/recording.json b/test/integration/commitsRevert/recording.json index 829287a3a..80125e840 100644 --- a/test/integration/commitsRevert/recording.json +++ b/test/integration/commitsRevert/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":471,"Mod":0,"Key":259,"Ch":0},{"Timestamp":694,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1015,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1703,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2503,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2622,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2653,"Mod":0,"Key":256,"Ch":119},{"Timestamp":2783,"Mod":0,"Key":256,"Ch":98},{"Timestamp":2878,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2950,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2990,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3110,"Mod":0,"Key":256,"Ch":99},{"Timestamp":3151,"Mod":0,"Key":256,"Ch":104},{"Timestamp":3398,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4102,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":614,"Mod":0,"Key":259,"Ch":0},{"Timestamp":749,"Mod":0,"Key":259,"Ch":0},{"Timestamp":980,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1219,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1854,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2469,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2725,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3892,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5421,"Mod":2,"Key":21,"Ch":21},{"Timestamp":5854,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6197,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6469,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6781,"Mod":2,"Key":21,"Ch":21},{"Timestamp":7078,"Mod":2,"Key":21,"Ch":21},{"Timestamp":7907,"Mod":0,"Key":256,"Ch":114},{"Timestamp":7989,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8148,"Mod":0,"Key":256,"Ch":118},{"Timestamp":8285,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8356,"Mod":0,"Key":256,"Ch":114},{"Timestamp":8493,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8604,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8700,"Mod":0,"Key":256,"Ch":102},{"Timestamp":9125,"Mod":0,"Key":127,"Ch":127},{"Timestamp":9189,"Mod":0,"Key":256,"Ch":99},{"Timestamp":9317,"Mod":0,"Key":256,"Ch":111},{"Timestamp":9509,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9637,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9685,"Mod":0,"Key":256,"Ch":105},{"Timestamp":9781,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9918,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11110,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file