Update stashPop and stashDrop setups

test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +1 @@
-f1963e622e30276cf4e5880109ea475434d6f2ae
+91a35446b7de806c46cd84a8574b2302443a5868

test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD

@@ -1,6 +1,4 @@
-0000000000000000000000000000000000000000 1ea8d05b2cbc972b48eae3181e846f82eeab50ef CI <CI@example.com> 1650002477 +0200	commit (initial): file0
+0000000000000000000000000000000000000000 bea28eaac7bdaf99371daf5b9a788061a12308f4 CI <CI@example.com> 1650270506 +0200	commit (initial): file0
-1ea8d05b2cbc972b48eae3181e846f82eeab50ef 8e724d42465144007f28d45514537886f527eef9 CI <CI@example.com> 1650002477 +0200	commit: file1
+bea28eaac7bdaf99371daf5b9a788061a12308f4 0e84352ca8531152e477715812e6e275d986984e CI <CI@example.com> 1650270506 +0200	commit: file1
-8e724d42465144007f28d45514537886f527eef9 f1963e622e30276cf4e5880109ea475434d6f2ae CI <CI@example.com> 1650002477 +0200	commit: file2
+0e84352ca8531152e477715812e6e275d986984e 91a35446b7de806c46cd84a8574b2302443a5868 CI <CI@example.com> 1650270506 +0200	commit: file2
-f1963e622e30276cf4e5880109ea475434d6f2ae f1963e622e30276cf4e5880109ea475434d6f2ae CI <CI@example.com> 1650002483 +0200	reset: moving to HEAD
+91a35446b7de806c46cd84a8574b2302443a5868 91a35446b7de806c46cd84a8574b2302443a5868 CI <CI@example.com> 1650270506 +0200	reset: moving to HEAD
-f1963e622e30276cf4e5880109ea475434d6f2ae f1963e622e30276cf4e5880109ea475434d6f2ae CI <CI@example.com> 1650002483 +0200	reset: moving to HEAD
-f1963e622e30276cf4e5880109ea475434d6f2ae f1963e622e30276cf4e5880109ea475434d6f2ae CI <CI@example.com> 1650002489 +0200	reset: moving to HEAD

test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 1ea8d05b2cbc972b48eae3181e846f82eeab50ef CI <CI@example.com> 1650002477 +0200	commit (initial): file0
+0000000000000000000000000000000000000000 bea28eaac7bdaf99371daf5b9a788061a12308f4 CI <CI@example.com> 1650270506 +0200	commit (initial): file0
-1ea8d05b2cbc972b48eae3181e846f82eeab50ef 8e724d42465144007f28d45514537886f527eef9 CI <CI@example.com> 1650002477 +0200	commit: file1
+bea28eaac7bdaf99371daf5b9a788061a12308f4 0e84352ca8531152e477715812e6e275d986984e CI <CI@example.com> 1650270506 +0200	commit: file1
-8e724d42465144007f28d45514537886f527eef9 f1963e622e30276cf4e5880109ea475434d6f2ae CI <CI@example.com> 1650002477 +0200	commit: file2
+0e84352ca8531152e477715812e6e275d986984e 91a35446b7de806c46cd84a8574b2302443a5868 CI <CI@example.com> 1650270506 +0200	commit: file2

test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447

@@ -1,4 +0,0 @@
-x
�ŽA
-Â0E]ç³d’N&‰ˆ]õÓv‚Ó–¡Ç·÷nÿñß°”2Up6œê¦
-Q{Ì<0�*‘„#©xŸ“�©¶'?6«l:WÈ6q£ìœ6è™ÔLj“
-O
�œ�¨‘O}.´ÜÚî¡»”õ¥—a)w°ìÑQLpÆãÔôˆªúçÜLó¨;,3yÖõWyz©3_%³@Þ

test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e

@@ -0,0 +1,3 @@
+x
ЌЋM
+В0F]зЩ2щПЂ€РUЏ1™L°РЪR"x|sW<ЮѓЏчm[є6h/эСRdFf@b"[]l…ahХ‰u=ъиЌ:и”wЧEИf!вT*5D—МШPђRО
™Сдж}ъk?х4лы4?еKЫ±КЌчнЎM`€ъ
+@
:NuщSWmYЕЁы/:2

test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf

@@ -1 +0,0 @@
-x
ŤŹ1k1F;߯Đ^˛,Ëv(Ą�é¶n™K¦�8®WčĎď-Ů;}đńŢđÚ2ĆuzŮVwHÍ{Őî*ł•Ú+%'öKĎAÍŰE˘…Žyzčę÷
z¨]�<"eiť=•‚
«+çÄ‘M:©?ů’5cbBsŃ}…9dăh	Ő´Ş¦¨–&ýŮľ–N3Ľťć˙Őń¸ůˇ-ă‚$D$.^‘§ýÝ#6˙'>ťçOXî0ô{wŽĎč×›Ów�N'

test/integration/stashDrop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448

@@ -1,3 +0,0 @@
-x
+)JMU°΄d040031QHΛΜI5`°±Ί²ΰ�Φ¶wΑ‡ήw.½ωhοTΣ[H
-�Ώe“ς"Η¨ΰSς,αΚgu"��YH
-�$x~5(ν;χrΥΆπ�ώ–WΪσ-Τ
Π–+^

test/integration/stashDrop/expected/repo/.git_keep/objects/75/a47f9be3d041530e975683cde13a62ddc65007

@@ -0,0 +1,2 @@
+x
ŤĎ=j1@áÔs
+ő� Ű’–[m•3Ȳ†
ÄëaĆ�?Ó¤Oűřš§Ł÷Ď	žóÓÜÍ€ŐÖ"«I”�Z.kńlž¬®ÉI3­14·bZ6Ůí1ˇ8	Lkj–1*Em™$s˘ęz˘ ścţó,h“· Z}$%tÍJÍT8)˛¶ŕu‘ďy;\ođz˝˝ŰŹôíË^tô7p‘Ń'dŚđŚq9ë91íź|ůx@—ăô8¦w�Ú>¶_*+Mĺ

test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master

@@ -1 +1 @@
-f1963e622e30276cf4e5880109ea475434d6f2ae
+91a35446b7de806c46cd84a8574b2302443a5868

test/integration/stashDrop/expected/repo/file1

@@ -1 +1 @@
-hello there
+test1

test/integration/stashDrop/recording.json

@@ -1 +1 @@
-{"KeyEvents":[{"Timestamp":1450,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2169,"Mod":0,"Key":256,"Ch":83},{"Timestamp":4172,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5203,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5380,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5453,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5555,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5626,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5763,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6115,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7300,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8683,"Mod":0,"Key":256,"Ch":83},{"Timestamp":9863,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11038,"Mod":0,"Key":256,"Ch":97},{"Timestamp":11123,"Mod":0,"Key":256,"Ch":115},{"Timestamp":11167,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12056,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13353,"Mod":0,"Key":256,"Ch":53},{"Timestamp":14713,"Mod":0,"Key":256,"Ch":100},{"Timestamp":15919,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17181,"Mod":0,"Key":256,"Ch":50},{"Timestamp":18431,"Mod":0,"Key":256,"Ch":53},{"Timestamp":19203,"Mod":0,"Key":256,"Ch":103},{"Timestamp":20228,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20771,"Mod":0,"Key":256,"Ch":50},{"Timestamp":21700,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]}
+{"KeyEvents":[{"Timestamp":767,"Mod":0,"Key":256,"Ch":53},{"Timestamp":1706,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2841,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3906,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":55}]}

test/integration/stashDrop/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"

test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +1 @@
-605615b78c181314a7a019e116647bfdf9127c94
+f9bd523df842e6b52de8880c366f7d15d6bab650

test/integration/stashPop/expected/repo/.git_keep/logs/HEAD

@@ -1,5 +1,4 @@
-0000000000000000000000000000000000000000 2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 CI <CI@example.com> 1650186466 +0200	commit (initial): file0
+0000000000000000000000000000000000000000 4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee CI <CI@example.com> 1650270548 +0200	commit (initial): file0
-2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 0138b2ed57b0412b2c2244a267fc1396f06ac287 CI <CI@example.com> 1650186466 +0200	commit: file1
+4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee f26e5e813038fe0c31c4733d57fcf93758736e71 CI <CI@example.com> 1650270548 +0200	commit: file1
-0138b2ed57b0412b2c2244a267fc1396f06ac287 605615b78c181314a7a019e116647bfdf9127c94 CI <CI@example.com> 1650186466 +0200	commit: file2
+f26e5e813038fe0c31c4733d57fcf93758736e71 f9bd523df842e6b52de8880c366f7d15d6bab650 CI <CI@example.com> 1650270548 +0200	commit: file2
-605615b78c181314a7a019e116647bfdf9127c94 605615b78c181314a7a019e116647bfdf9127c94 CI <CI@example.com> 1650186469 +0200	reset: moving to HEAD
+f9bd523df842e6b52de8880c366f7d15d6bab650 f9bd523df842e6b52de8880c366f7d15d6bab650 CI <CI@example.com> 1650270548 +0200	reset: moving to HEAD
-605615b78c181314a7a019e116647bfdf9127c94 605615b78c181314a7a019e116647bfdf9127c94 CI <CI@example.com> 1650186471 +0200	reset: moving to HEAD

test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 CI <CI@example.com> 1650186466 +0200	commit (initial): file0
+0000000000000000000000000000000000000000 4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee CI <CI@example.com> 1650270548 +0200	commit (initial): file0
-2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 0138b2ed57b0412b2c2244a267fc1396f06ac287 CI <CI@example.com> 1650186466 +0200	commit: file1
+4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee f26e5e813038fe0c31c4733d57fcf93758736e71 CI <CI@example.com> 1650270548 +0200	commit: file1
-0138b2ed57b0412b2c2244a267fc1396f06ac287 605615b78c181314a7a019e116647bfdf9127c94 CI <CI@example.com> 1650186466 +0200	commit: file2
+f26e5e813038fe0c31c4733d57fcf93758736e71 f9bd523df842e6b52de8880c366f7d15d6bab650 CI <CI@example.com> 1650270548 +0200	commit: file2

test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 5e6c498354e93f4049e80254810f4577b180a8ab CI <CI@example.com> 1650186471 +0200	On master: asd

test/integration/stashPop/expected/repo/.git_keep/objects/01/38b2ed57b0412b2c2244a267fc1396f06ac287

@@ -1,2 +0,0 @@
-x
��K
-Β0@]ηΩ2ωMΊκ1¦“	SJ�o�ΰφρ<nµn]›d/ύΡ"2'fHΔD6;,+GJ΅d'Φ
ϊδΡuΠ)ο®­°ηVζ€; �@pΤq
“��@Ρ§ΏΪ©ηEίηε)_�Η.7nυ΅
0zD} S]ώΤUΩv1κΜ:

test/integration/stashPop/expected/repo/.git_keep/objects/2d/79a3b4f905a83d994f860d3d91625fab899422

@@ -0,0 +1 @@
+x
�ÏËJ1…a×ýµ$©ÜaV³ò*©*F0“¦;‚�o6îÝ>ümôþ9
C~š‡„&ZH…"¹Ä¹hÁ è¥j²ÄÒjtlÕ¤m§C´TèX³G‰5 KÎÙ4£&¶�c¥ƒùóU©i¹IÌÕW5ž=/ÓŒÃì$Zõ•i£ïy\oðz½½ËõýK^Úèo`×&|†gƒÆlk]SþÉ·�t:—¿À9é¼ÃÀÇØ
š=P6

test/integration/stashPop/expected/repo/.git_keep/objects/42/ffa95ec8ce68b4bf04d4dab6c03283e61f4bda

@@ -0,0 +1,3 @@
+x
ŤŽÁ
+Â0D=ç+ö.H˛m’UD„žúIv�…¦-5B?ß\Ľ{ť™7Ľ´–2U@ăOu�«Ż92cČ1łŐĆ;ÉžÄa&µ…]–
+ůŮbÇ™z-r; ť:ç˛gcŮĹťŐ*|ękÝaá>ŚO9BŮfą¤µ<Ŕ´˝¶=ÁYŁÖŞĄMŞĘźs5-,¬”đnÔígyšŐ8Bj

test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee

@@ -0,0 +1,2 @@
+x
�ÍA
+à Fá®=Åìe´£F(¡�UŽ¡ñ—"†`!ÇoŽÐíヷ´Z×NZäÖ€4žp>…rÒÖ»˜5ÀC*Rؤ\L€£â·ÚAÓL¯i~ãŒußðXZI;ËƳ•�îl˜ÕU¯IÇŸ\•u«Úl+è

test/integration/stashPop/expected/repo/.git_keep/objects/5e/6c498354e93f4049e80254810f4577b180a8ab

@@ -1,2 +0,0 @@
-x
�Ο±j1ΠΤχκ
fW·Z­BW®ό
ZiE‘Ο�ΘηG�{·Γc†)[οίΓy’·±›9fΥ"�JΝ­
-Η��κA›FR•–%	‘,χΌΫm8†ΐ4JAΑ)Η�‘™Ά¶ΪϊX=½Κ½Y�UY�(†Bs©zTΖ”‚¬M=/ωw|m»;_άΗωr²Ώάο?v,[�tΘ
Pf?Ίx€e¦σΔ°ωr½Ή�ΣΏ»ό¨��’I�

test/integration/stashPop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448

@@ -1,3 +0,0 @@
-x
+)JMU°΄d040031QHΛΜI5`°±Ί²ΰ�Φ¶wΑ‡ήw.½ωhοTΣ[H
-�Ώe“ς"Η¨ΰSς,αΚgu"��YH
-�$x~5(ν;χrΥΆπ�ώ–WΪσ-Τ
Π–+^

test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26

@@ -1,3 +0,0 @@
-x
�ŽA
-Â0E]ç³$“¶ÉDD„®zŒi2Á‚iJ�Ðã›�{·Ÿ÷ø/”œ—
-Ý©î"à…ˆ�Ž�"™
§9ÅA£³’	™n&¨�wY+X=XfG
	;ìÙ±F/ˆÖö®©É£qÁ÷Š?õYv'¸�ÓCÎÛK.¡ä; mÔx„³6Z«¶¶¨*âjY£PVÈünÖõWiy‰Q_UÈ@Ú

test/integration/stashPop/expected/repo/.git_keep/objects/f9/bd523df842e6b52de8880c366f7d15d6bab650

@@ -0,0 +1,2 @@
+x
�Î1
+Ã0@ÑÎ>…÷B‘¥ØR ”B¦ÑeHš\èñ›#tý¼á붮só¡ÇK;Ì|o"™¡¨ÁR0ש–�“U"H“¢º=ön¾b²hHª�RÐŽ‰J䪵'ŽÂ”ŒƒËŸöÚ?Œþ>ŒOûæu_ì¦Ûúð!E@†Ø‰¿¸³žSÍþä®Î‹¡û
“Ï9y

test/integration/stashPop/expected/repo/.git_keep/refs/heads/master

@@ -1 +1 @@
-605615b78c181314a7a019e116647bfdf9127c94
+f9bd523df842e6b52de8880c366f7d15d6bab650

test/integration/stashPop/expected/repo/.git_keep/refs/stash

@@ -1 +0,0 @@
-5e6c498354e93f4049e80254810f4577b180a8ab

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}]}
+{"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}]}

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"