From eb038d1950909f666ff2262f83f66e5b26bf1e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= Date: Mon, 18 Apr 2022 10:29:36 +0200 Subject: [PATCH] Update stashPop and stashDrop setups --- .../stashDrop/expected/repo/.git_keep/ORIG_HEAD | 2 +- .../stashDrop/expected/repo/.git_keep/index | Bin 262 -> 281 bytes .../stashDrop/expected/repo/.git_keep/logs/HEAD | 10 ++++------ .../repo/.git_keep/logs/refs/heads/master | 6 +++--- .../0d/b7c2bffa900585f06112e5b06f8f358638f447 | 4 ---- .../0e/84352ca8531152e477715812e6e275d986984e | 3 +++ .../1c/88e069f3e318f1e0e02188cf65d360ab4eab67 | Bin 185 -> 0 bytes .../1e/a8d05b2cbc972b48eae3181e846f82eeab50ef | Bin 118 -> 0 bytes .../2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf | 1 - .../5a/0e5672e3ccb264c401de9b84957c53138cd32c | Bin 0 -> 162 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 --- .../75/a47f9be3d041530e975683cde13a62ddc65007 | 2 ++ .../87/82cd42420de6a24264417d43d50ada9aa53ad5 | Bin 162 -> 0 bytes .../8e/724d42465144007f28d45514537886f527eef9 | Bin 146 -> 0 bytes .../8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 | Bin 100 -> 0 bytes .../91/a35446b7de806c46cd84a8574b2302443a5868 | Bin 0 -> 147 bytes .../a2/11ee6ddb1146ba9680c58c08e40fa0162bd98d | Bin 182 -> 0 bytes .../be/a28eaac7bdaf99371daf5b9a788061a12308f4 | Bin 0 -> 118 bytes .../f1/963e622e30276cf4e5880109ea475434d6f2ae | Bin 146 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 2 +- test/integration/stashDrop/expected/repo/file1 | 2 +- test/integration/stashDrop/recording.json | 2 +- test/integration/stashDrop/setup.sh | 2 ++ .../stashPop/expected/repo/.git_keep/ORIG_HEAD | 2 +- .../stashPop/expected/repo/.git_keep/index | Bin 262 -> 262 bytes .../stashPop/expected/repo/.git_keep/logs/HEAD | 9 ++++----- .../repo/.git_keep/logs/refs/heads/master | 6 +++--- .../expected/repo/.git_keep/logs/refs/stash | 1 - .../01/38b2ed57b0412b2c2244a267fc1396f06ac287 | 2 -- .../2d/79a3b4f905a83d994f860d3d91625fab899422 | 1 + .../2e/c2033bcc750a5c30ad6f00e6caa7b5848f26f0 | Bin 118 -> 0 bytes .../42/ffa95ec8ce68b4bf04d4dab6c03283e61f4bda | 3 +++ .../4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee | 2 ++ .../5e/6c498354e93f4049e80254810f4577b180a8ab | 2 -- .../60/5615b78c181314a7a019e116647bfdf9127c94 | Bin 147 -> 0 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 --- .../8b/0567b6e2fd39edce87bc7ed6e7ba7868e55930 | Bin 183 -> 0 bytes .../a8/4a187f63b05bb43f19cfbc8bedab97ed33272d | Bin 162 -> 0 bytes .../b8/372ee9ddb68d8b15c440d86d21b6199583fb26 | 3 --- .../f2/6e5e813038fe0c31c4733d57fcf93758736e71 | Bin 0 -> 147 bytes .../f9/bd523df842e6b52de8880c366f7d15d6bab650 | 2 ++ .../expected/repo/.git_keep/refs/heads/master | 2 +- .../stashPop/expected/repo/.git_keep/refs/stash | 1 - test/integration/stashPop/recording.json | 2 +- test/integration/stashPop/setup.sh | 2 ++ 45 files changed, 38 insertions(+), 44 deletions(-) delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/1c/88e069f3e318f1e0e02188cf65d360ab4eab67 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/1e/a8d05b2cbc972b48eae3181e846f82eeab50ef delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/5a/0e5672e3ccb264c401de9b84957c53138cd32c delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/75/a47f9be3d041530e975683cde13a62ddc65007 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/87/82cd42420de6a24264417d43d50ada9aa53ad5 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/8e/724d42465144007f28d45514537886f527eef9 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/91/a35446b7de806c46cd84a8574b2302443a5868 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/a2/11ee6ddb1146ba9680c58c08e40fa0162bd98d create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/be/a28eaac7bdaf99371daf5b9a788061a12308f4 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/f1/963e622e30276cf4e5880109ea475434d6f2ae delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/01/38b2ed57b0412b2c2244a267fc1396f06ac287 create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/2d/79a3b4f905a83d994f860d3d91625fab899422 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/2e/c2033bcc750a5c30ad6f00e6caa7b5848f26f0 create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/42/ffa95ec8ce68b4bf04d4dab6c03283e61f4bda create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/5e/6c498354e93f4049e80254810f4577b180a8ab delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/60/5615b78c181314a7a019e116647bfdf9127c94 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/8b/0567b6e2fd39edce87bc7ed6e7ba7868e55930 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/a8/4a187f63b05bb43f19cfbc8bedab97ed33272d delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/f2/6e5e813038fe0c31c4733d57fcf93758736e71 create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/f9/bd523df842e6b52de8880c366f7d15d6bab650 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/refs/stash diff --git a/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD index 7bd761f02..11345d776 100644 --- a/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -f1963e622e30276cf4e5880109ea475434d6f2ae +91a35446b7de806c46cd84a8574b2302443a5868 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/index b/test/integration/stashDrop/expected/repo/.git_keep/index index 8256e1e361ac97a49ad43baf8076b6bed053e829..a201208c88235bb656251ccf533ad076122fa146 100644 GIT binary patch delta 162 zcmZo;n#rW%;u+-3z`(!+#LP*tidrJ>ZGkWvC?>`5S!eb{6$1^Bm}teOQ!pATcb$Qu zaS2fC3kYUln^>bLj$P@EiCfI|BpHkq47lcXEayFOL-*49{Z|>w-d8;AP~M|ca^9{z VT=7R1%e_y^PHMFuZML`{000zzH5~u| delta 143 zcmbQq)W)RZ;u+-3z`(!+#LP*NT)Ku%(!wwrC?>`5;f(l16$1?*8wY4yf-EtyMo~PH z%hH_rdIQiHFb$Lj8MAxh7ISGf23 1650002477 +0200 commit (initial): file0 -1ea8d05b2cbc972b48eae3181e846f82eeab50ef 8e724d42465144007f28d45514537886f527eef9 CI 1650002477 +0200 commit: file1 -8e724d42465144007f28d45514537886f527eef9 f1963e622e30276cf4e5880109ea475434d6f2ae CI 1650002477 +0200 commit: file2 -f1963e622e30276cf4e5880109ea475434d6f2ae f1963e622e30276cf4e5880109ea475434d6f2ae CI 1650002483 +0200 reset: moving to HEAD -f1963e622e30276cf4e5880109ea475434d6f2ae f1963e622e30276cf4e5880109ea475434d6f2ae CI 1650002483 +0200 reset: moving to HEAD -f1963e622e30276cf4e5880109ea475434d6f2ae f1963e622e30276cf4e5880109ea475434d6f2ae CI 1650002489 +0200 reset: moving to HEAD +0000000000000000000000000000000000000000 bea28eaac7bdaf99371daf5b9a788061a12308f4 CI 1650270506 +0200 commit (initial): file0 +bea28eaac7bdaf99371daf5b9a788061a12308f4 0e84352ca8531152e477715812e6e275d986984e CI 1650270506 +0200 commit: file1 +0e84352ca8531152e477715812e6e275d986984e 91a35446b7de806c46cd84a8574b2302443a5868 CI 1650270506 +0200 commit: file2 +91a35446b7de806c46cd84a8574b2302443a5868 91a35446b7de806c46cd84a8574b2302443a5868 CI 1650270506 +0200 reset: moving to HEAD diff --git a/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master index f257dee84..06a7a9d1d 100644 --- a/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 1ea8d05b2cbc972b48eae3181e846f82eeab50ef CI 1650002477 +0200 commit (initial): file0 -1ea8d05b2cbc972b48eae3181e846f82eeab50ef 8e724d42465144007f28d45514537886f527eef9 CI 1650002477 +0200 commit: file1 -8e724d42465144007f28d45514537886f527eef9 f1963e622e30276cf4e5880109ea475434d6f2ae CI 1650002477 +0200 commit: file2 +0000000000000000000000000000000000000000 bea28eaac7bdaf99371daf5b9a788061a12308f4 CI 1650270506 +0200 commit (initial): file0 +bea28eaac7bdaf99371daf5b9a788061a12308f4 0e84352ca8531152e477715812e6e275d986984e CI 1650270506 +0200 commit: file1 +0e84352ca8531152e477715812e6e275d986984e 91a35446b7de806c46cd84a8574b2302443a5868 CI 1650270506 +0200 commit: file2 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 b/test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 deleted file mode 100644 index 858c3f4b3..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 +++ /dev/null @@ -1,4 +0,0 @@ -xA -0E]dN&]vӖǷn߰2Up6 -Q{<0*#x'?6l:W6q6Lj -O O}.a)wQLpL;,3yWyz3_%@ \ No newline at end of file diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e b/test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e new file mode 100644 index 000000000..ad8496326 --- /dev/null +++ b/test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e @@ -0,0 +1,3 @@ +xM +0F] 2πU1LR"x|sW<ރm[6h/RdFf@b"[]lahՉu=:wEf!T*5DPR }k?44?K۱ʍM ` +@ :NuSWmYŨ/:2 \ No newline at end of file diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/1c/88e069f3e318f1e0e02188cf65d360ab4eab67 b/test/integration/stashDrop/expected/repo/.git_keep/objects/1c/88e069f3e318f1e0e02188cf65d360ab4eab67 deleted file mode 100644 index 3443df0982ed9bcf3de1eb96ff43614a4815b564..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmV;q07n0K0gcbWN(3x$9svQCqaG)w|C2B8*D&;c_~&q+`r-BqmOx7P&!JuA diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/a8d05b2cbc972b48eae3181e846f82eeab50ef b/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/a8d05b2cbc972b48eae3181e846f82eeab50ef deleted file mode 100644 index 8e5c770efbbe8e9d52b5872102267896ae857b92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPOY@h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;s$26 Y>OEcAGMlrWla4>RDa#5r2iRaM++^lEIRF3v diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf b/test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf deleted file mode 100644 index f79c6d13b..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf +++ /dev/null @@ -1 +0,0 @@ -x1k1 F;߯^,v(nK8W-;}2uzVwH{*+%'KAEyz z]<"ei=+đM:? 5cbBs}9dh մ&پN3-$D$.^#6'>OX0{wכwN' \ No newline at end of file diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/5a/0e5672e3ccb264c401de9b84957c53138cd32c b/test/integration/stashDrop/expected/repo/.git_keep/objects/5a/0e5672e3ccb264c401de9b84957c53138cd32c new file mode 100644 index 0000000000000000000000000000000000000000..08f8bb69062ddbb536c98773cf7fd990309d8f9c GIT binary patch literal 162 zcmV;T0A2rh0gaB!3c@fD06pg`_Aba~o5w05LQnmSZL-Be)0P^cpKmYTy$&-lX(?r_ zKsKK0rV3YOmWVlVX3Cjl=!fjl#-KxFwanD?iIQ1m)49UcO5>dieay-jk_#!b6ZX;d z)F3(6i08mYKJ~S1&~|WdyQl6_)=4jEDG#v0BSrKW;EaT54th*g{ZlvNoOOp~h9d8y Qy8W(T7$+t31!HeO)t>iJ!T_*+M \ No newline at end of file diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/87/82cd42420de6a24264417d43d50ada9aa53ad5 b/test/integration/stashDrop/expected/repo/.git_keep/objects/87/82cd42420de6a24264417d43d50ada9aa53ad5 deleted file mode 100644 index e4dd3c06e3e75f509052584aa93f981426cedd8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0gaA93c@fD06pgwdlzK8*(Mti5qjz~l5~Rw(@Krt^XjBpvon|@+_KJ=8=dWFvQh)66Jj!1}Rr~6dXKXo%NlYU@bpvKo; QoqtzQ=7*B`0(yr*MAq3&iU0rr diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/724d42465144007f28d45514537886f527eef9 b/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/724d42465144007f28d45514537886f527eef9 deleted file mode 100644 index 4fb5b0defc93f9ab390ae9f657dd383084363f19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaAJ3c@fDKwak)*$Xn6{6R$Ms>hg2CRk`}DG@xrJ%ZcEd+>PceHq$h zyo^IcSBQZ*GeagO!fHb+94Y%&t)PYAvJ1|roep`Qp-`&e3v%HcvA858)+8gzg_cl+ ziU(ZIq?kUw?RmQ{@U0sM_RVlY`o AvH$=8 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 deleted file mode 100644 index 2a1928079869c5c79e37d717252c0b2c211d73fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmV-q0Gt1K0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gvSTj#0s<Hr>)kd zc^v4{4l_TPY81#xvr^6!%Um)8O0Xhos7l?OD7ifz_HG_b`;I9^tFMSEQa;c)QD?x9Q9mj>;iugpjxyD&-6w ziV7yeh@CBn{(0y%wNTBZ08l0a_C6?8V9ORMbIgXAHu;_(`{6EE_jzc_jHUti8iK1hvR2mk;8 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/be/a28eaac7bdaf99371daf5b9a788061a12308f4 b/test/integration/stashDrop/expected/repo/.git_keep/objects/be/a28eaac7bdaf99371daf5b9a788061a12308f4 new file mode 100644 index 0000000000000000000000000000000000000000..3ed6793afac596828f2854312e0a90518a574585 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{jFZHGh|pD!ku-m>&=4sRJia}G+s6lQ>8-7U ztmm5sA Y$DYnC%;u=aWZ+M3>bil=57?F~+>}&42LJ#7 literal 0 HcmV?d00001 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/f1/963e622e30276cf4e5880109ea475434d6f2ae b/test/integration/stashDrop/expected/repo/.git_keep/objects/f1/963e622e30276cf4e5880109ea475434d6f2ae deleted file mode 100644 index 3fd7331e6863cdf73414cfd8d95f226ceead0fa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V0^jsJnqu3OVH&#$9P3)(|Z8`OOo0oM8@=Tdixi zZp2GJRPCtDi9j+7qX?$56baxcY9Us~jKh*Kn>`)+?v|C%i$@=W^B#Z-viNX97>GHR zfTUVRlRo{`4m-{EKFv@4rn+x>%dI}Fiva-86WJ>ufI00s)%DNZlyy@yKQH$ file1 echo "hello there" > file2 echo "hello there" > file3 + +git stash save "stash to drop" diff --git a/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD index 32bd1b5cc..3823b7b86 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -605615b78c181314a7a019e116647bfdf9127c94 +f9bd523df842e6b52de8880c366f7d15d6bab650 diff --git a/test/integration/stashPop/expected/repo/.git_keep/index b/test/integration/stashPop/expected/repo/.git_keep/index index 0850077fddf2ff6ed10d14e2a02b11809beaa05e..667aead257923c7a197135e29100fda4e57380f8 100644 GIT binary patch delta 65 zcmZo;YGYDy@eFciU|?VZV&`5SvO*$$~h6cJvN;ECl?t=xL)zS MH+LV?Gvk6p0P=ei8vpWNf{S(20gV3^g8%>k diff --git a/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD b/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD index 6740e556b..f205db06f 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD +++ b/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD @@ -1,5 +1,4 @@ -0000000000000000000000000000000000000000 2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 CI 1650186466 +0200 commit (initial): file0 -2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 0138b2ed57b0412b2c2244a267fc1396f06ac287 CI 1650186466 +0200 commit: file1 -0138b2ed57b0412b2c2244a267fc1396f06ac287 605615b78c181314a7a019e116647bfdf9127c94 CI 1650186466 +0200 commit: file2 -605615b78c181314a7a019e116647bfdf9127c94 605615b78c181314a7a019e116647bfdf9127c94 CI 1650186469 +0200 reset: moving to HEAD -605615b78c181314a7a019e116647bfdf9127c94 605615b78c181314a7a019e116647bfdf9127c94 CI 1650186471 +0200 reset: moving to HEAD +0000000000000000000000000000000000000000 4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee CI 1650270548 +0200 commit (initial): file0 +4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee f26e5e813038fe0c31c4733d57fcf93758736e71 CI 1650270548 +0200 commit: file1 +f26e5e813038fe0c31c4733d57fcf93758736e71 f9bd523df842e6b52de8880c366f7d15d6bab650 CI 1650270548 +0200 commit: file2 +f9bd523df842e6b52de8880c366f7d15d6bab650 f9bd523df842e6b52de8880c366f7d15d6bab650 CI 1650270548 +0200 reset: moving to HEAD diff --git a/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master index f83a90cae..f3893791a 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 CI 1650186466 +0200 commit (initial): file0 -2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 0138b2ed57b0412b2c2244a267fc1396f06ac287 CI 1650186466 +0200 commit: file1 -0138b2ed57b0412b2c2244a267fc1396f06ac287 605615b78c181314a7a019e116647bfdf9127c94 CI 1650186466 +0200 commit: file2 +0000000000000000000000000000000000000000 4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee CI 1650270548 +0200 commit (initial): file0 +4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee f26e5e813038fe0c31c4733d57fcf93758736e71 CI 1650270548 +0200 commit: file1 +f26e5e813038fe0c31c4733d57fcf93758736e71 f9bd523df842e6b52de8880c366f7d15d6bab650 CI 1650270548 +0200 commit: file2 diff --git a/test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index ca9920f6e..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5e6c498354e93f4049e80254810f4577b180a8ab CI 1650186471 +0200 On master: asd diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/01/38b2ed57b0412b2c2244a267fc1396f06ac287 b/test/integration/stashPop/expected/repo/.git_keep/objects/01/38b2ed57b0412b2c2244a267fc1396f06ac287 deleted file mode 100644 index d4936dcdf..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/01/38b2ed57b0412b2c2244a267fc1396f06ac287 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] 2M1 SJom9C~&ZH"Ĺh jjtlդmCTXG5 K4&cUiIW5=/ӌ$Ziy\ozK^o`&|glk]Sɷt:9=P6 \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/2e/c2033bcc750a5c30ad6f00e6caa7b5848f26f0 b/test/integration/stashPop/expected/repo/.git_keep/objects/2e/c2033bcc750a5c30ad6f00e6caa7b5848f26f0 deleted file mode 100644 index 340b8157b4b713e49e22d3a517224b81a8717e9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPLEVB0^U^M$-JjLPJZ5;PLGd+&(^d^H%H9 zNK`NF07!6$^(lmqlXShsEC3IwXknjn@c|lCy^Ejr-VPckdW_Qx-&pq*w|T2i66;t7 YQ!~1O9Bf<=Y֪Mʟs5-, ngy8Bj \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee b/test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee new file mode 100644 index 000000000..6f2666e32 --- /dev/null +++ b/test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee @@ -0,0 +1,2 @@ +xA + F= eF(U"`!oヷZNZ4p>rֻ5C*Rؤ\LALi~uXZI;ƳlUIǟ\ul+ \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/5e/6c498354e93f4049e80254810f4577b180a8ab b/test/integration/stashPop/expected/repo/.git_keep/objects/5e/6c498354e93f4049e80254810f4577b180a8ab deleted file mode 100644 index a8d3c8495..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/5e/6c498354e93f4049e80254810f4577b180a8ab +++ /dev/null @@ -1,2 +0,0 @@ -xϱj1 fWZBW ZiEϜG{c)[y9f"Jͭ -AFR% ,m84JA) X=YUY(BszTƔM=/w|m;_r?v,[tPf?xeİrӿI \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/60/5615b78c181314a7a019e116647bfdf9127c94 b/test/integration/stashPop/expected/repo/.git_keep/objects/60/5615b78c181314a7a019e116647bfdf9127c94 deleted file mode 100644 index 22dbe19c0e7a5631d20297911d48cf478d161106..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0@2&ANe73OVH&x~?=3n-DDY`OOo09R_A(Yi;S) zjdMq&2cSX7pK5%$^Q?cMHyQMlD0k5FBO{#1Ilvtm6Dg z6(|XEH0je{+hM2K-lzGg-_-V1Z?d(Ab#w-p0+GD}0+^GYQ(gbmOQYBOm?w6j#w9%G=;7kM1Uy9#M-AR^q}lj?S`;k#k_r*0Nf|CQAd-Jz*amCuHo<1{XAXK_s#+ z<|%tLE_tiMr#$wEzGB diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 b/test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 deleted file mode 100644 index 2a71485a3..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]$DDzi2iJ㛍{/ -ݩ"" 9A n&wY+X=XfG ;ٱF/ɣq?Yv'CK.;mx6Z*jYPVnWiyQ_U@ \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/f2/6e5e813038fe0c31c4733d57fcf93758736e71 b/test/integration/stashPop/expected/repo/.git_keep/objects/f2/6e5e813038fe0c31c4733d57fcf93758736e71 new file mode 100644 index 0000000000000000000000000000000000000000..9934ea2ee2397a98b386dfdfe466bcc273d509c6 GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0^bRU?#A$SKcQ*Odlh4Z%X6-#nqWVVJ{kZ*3jg zBzqZ$h%OKVb7F=>Ok|4-HFKooYjI*71WXvvsGSaZ4~;YdGgjkWERp4;39G}vDN|%` za&|}}iaz7j4?QpXJ}*!CQrkDVac>W8f(IMHBRBÑeH\#t붮sK;|o"R0שU "H=nbhHRЎJ䪵'”˟?>Ou_!E@؉S΋9y \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master b/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master index 32bd1b5cc..3823b7b86 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master +++ b/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master @@ -1 +1 @@ -605615b78c181314a7a019e116647bfdf9127c94 +f9bd523df842e6b52de8880c366f7d15d6bab650 diff --git a/test/integration/stashPop/expected/repo/.git_keep/refs/stash b/test/integration/stashPop/expected/repo/.git_keep/refs/stash deleted file mode 100644 index 3a695ec9e..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -5e6c498354e93f4049e80254810f4577b180a8ab diff --git a/test/integration/stashPop/recording.json b/test/integration/stashPop/recording.json index 8629fa444..272f83875 100644 --- a/test/integration/stashPop/recording.json +++ b/test/integration/stashPop/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":752,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1144,"Mod":0,"Key":256,"Ch":83},{"Timestamp":1424,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1640,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1742,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1775,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1832,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2097,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2552,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3065,"Mod":0,"Key":256,"Ch":83},{"Timestamp":3425,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3584,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3840,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3880,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3967,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4656,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5121,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5304,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5608,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6008,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6921,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7328,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8304,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":658,"Mod":0,"Key":256,"Ch":53},{"Timestamp":1387,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2364,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3446,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":55}]} \ No newline at end of file diff --git a/test/integration/stashPop/setup.sh b/test/integration/stashPop/setup.sh index caff56b7d..2278d53d8 100644 --- a/test/integration/stashPop/setup.sh +++ b/test/integration/stashPop/setup.sh @@ -24,3 +24,5 @@ git commit -am file2 echo "hello there" > file1 echo "hello there" > file2 echo "hello there" > file3 + +git stash save "stash to drop"