diff --git a/docs/Config.md b/docs/Config.md index ab701623c..b83346610 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -44,7 +44,7 @@ gui: show: true mouseEvents: true skipUnstageLineWarning: false - skipStashWarning: true + skipStashWarning: false showFileTree: true # for rendering changes files in a tree format showListFooter: true # for seeing the '5 of 20' message in list panels showRandomTip: true diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 2b79f941f..a9977bdf6 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -327,7 +327,7 @@ func GetDefaultConfig() *UserConfig { ScrollPastBottom: true, MouseEvents: true, SkipUnstageLineWarning: false, - SkipStashWarning: true, + SkipStashWarning: false, SidePanelWidth: 0.3333, ExpandFocusedSidePanel: false, MainPanelSplitMode: "flexible", diff --git a/test/integration/stash/expected/.git_keep/ORIG_HEAD b/test/integration/stash/expected/.git_keep/ORIG_HEAD index 43680a2d9..78e4eb58e 100644 --- a/test/integration/stash/expected/.git_keep/ORIG_HEAD +++ b/test/integration/stash/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -05f4edebb0aadc631926ea90f2f4f74033127a19 +f348ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash/expected/.git_keep/index b/test/integration/stash/expected/.git_keep/index index 705b3a73b..daebfa4ef 100644 Binary files a/test/integration/stash/expected/.git_keep/index and b/test/integration/stash/expected/.git_keep/index differ diff --git a/test/integration/stash/expected/.git_keep/logs/HEAD b/test/integration/stash/expected/.git_keep/logs/HEAD index 474266cc1..f95cf06ac 100644 --- a/test/integration/stash/expected/.git_keep/logs/HEAD +++ b/test/integration/stash/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff CI 1617674510 +1000 commit (initial): file0 -df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff 211d7ffb63edc061a144eb1e198d94768000c723 CI 1617674510 +1000 commit: file1 -211d7ffb63edc061a144eb1e198d94768000c723 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674510 +1000 commit: file2 -05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674513 +1000 reset: moving to HEAD -05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674513 +1000 reset: moving to HEAD -05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674517 +1000 reset: moving to HEAD +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011558 +1100 reset: moving to HEAD diff --git a/test/integration/stash/expected/.git_keep/logs/refs/heads/master b/test/integration/stash/expected/.git_keep/logs/refs/heads/master index 0dd71a278..d1bf421f8 100644 --- a/test/integration/stash/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/stash/expected/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff CI 1617674510 +1000 commit (initial): file0 -df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff 211d7ffb63edc061a144eb1e198d94768000c723 CI 1617674510 +1000 commit: file1 -211d7ffb63edc061a144eb1e198d94768000c723 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674510 +1000 commit: file2 +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 diff --git a/test/integration/stash/expected/.git_keep/logs/refs/stash b/test/integration/stash/expected/.git_keep/logs/refs/stash index 2815df3de..3f07cf22e 100644 --- a/test/integration/stash/expected/.git_keep/logs/refs/stash +++ b/test/integration/stash/expected/.git_keep/logs/refs/stash @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 1abf1a2a5d2e97b92e49391b4c92f945b5283606 CI 1617674513 +1000 On master: asd -1abf1a2a5d2e97b92e49391b4c92f945b5283606 400778244da4711bc99a7b1a84bab99213601a4e CI 1617674517 +1000 On master: asd +0000000000000000000000000000000000000000 e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 CI 1643011556 +1100 On master: asd +e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 2efac8148440778cbddcd80ac7477981277dcffe CI 1643011558 +1100 On master: asd diff --git a/test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 b/test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 deleted file mode 100644 index 14ea7d52a..000000000 Binary files a/test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 and /dev/null differ diff --git a/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 b/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 deleted file mode 100644 index 100e8dc01..000000000 --- a/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 +++ /dev/null @@ -1 +0,0 @@ -xϱj1 Eu]J dge\-ݻ|˯3D*Os7 9v^2yc*Zq).fɺ"]sIN)adYzi55*XW36.|Ϗmkx\#eϺ93 `911|y!ÿy_&KF \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 b/test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 deleted file mode 100644 index f30621f1b..000000000 Binary files a/test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 and /dev/null differ diff --git a/test/integration/stash/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc b/test/integration/stash/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc new file mode 100644 index 000000000..aab767a08 Binary files /dev/null and b/test/integration/stash/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc differ diff --git a/test/integration/stash/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe b/test/integration/stash/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe new file mode 100644 index 000000000..54545b630 --- /dev/null +++ b/test/integration/stash/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe @@ -0,0 +1 @@ +xAj1 4v)%UV=$˴Pgątg{bOpF[`X,`L ˶eQMl,y.5\FTeHJ3H:!5ER [.nj|^/׳H g2B@\:O '_o1 ȣK \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a b/test/integration/stash/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a new file mode 100644 index 000000000..1b8805172 Binary files /dev/null and b/test/integration/stash/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a differ diff --git a/test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e b/test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e deleted file mode 100644 index 791a8042e..000000000 --- a/test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e +++ /dev/null @@ -1,2 +0,0 @@ -xAj1 d֨*A%Z3aBt߶1>g>,GΌ - -yZ4orn3@vnjo%b*ə %(>W!.^k)IDMJw'|/=?=\r=ۏ=m,ȅ)#rGĴ>J` \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d b/test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d new file mode 100644 index 000000000..bc099c320 Binary files /dev/null and b/test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d differ diff --git a/test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 b/test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 deleted file mode 100644 index 391a716d7..000000000 Binary files a/test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 and /dev/null differ diff --git a/test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc b/test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc deleted file mode 100644 index 10d9df475..000000000 Binary files a/test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc and /dev/null differ diff --git a/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 b/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 deleted file mode 100644 index 7a7fe2249..000000000 --- a/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 +++ /dev/null @@ -1 +0,0 @@ -xjA ESWi^KZ5 s9]{% Wq"۱z Bř.%6r!`d͖EH5<9' 'ϊ(՛4ٴ!ѮPf36>&Rg|gx;+qN""NG '>]OX{ כ?XP \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 b/test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 new file mode 100644 index 000000000..0cdd88ea0 Binary files /dev/null and b/test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 differ diff --git a/test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b b/test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b new file mode 100644 index 000000000..9dcd075d6 Binary files /dev/null and b/test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b differ diff --git a/test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff b/test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff deleted file mode 100644 index 341ebdd36..000000000 Binary files a/test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff and /dev/null differ diff --git a/test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 b/test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 new file mode 100644 index 000000000..f57ce417b Binary files /dev/null and b/test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 differ diff --git a/test/integration/stash/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 b/test/integration/stash/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 new file mode 100644 index 000000000..8faee1fcd Binary files /dev/null and b/test/integration/stash/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 differ diff --git a/test/integration/stash/expected/.git_keep/refs/heads/master b/test/integration/stash/expected/.git_keep/refs/heads/master index 43680a2d9..78e4eb58e 100644 --- a/test/integration/stash/expected/.git_keep/refs/heads/master +++ b/test/integration/stash/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -05f4edebb0aadc631926ea90f2f4f74033127a19 +f348ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash/expected/.git_keep/refs/stash b/test/integration/stash/expected/.git_keep/refs/stash index 7fd3144c3..9123248e5 100644 --- a/test/integration/stash/expected/.git_keep/refs/stash +++ b/test/integration/stash/expected/.git_keep/refs/stash @@ -1 +1 @@ -400778244da4711bc99a7b1a84bab99213601a4e +2efac8148440778cbddcd80ac7477981277dcffe diff --git a/test/integration/stash/recording.json b/test/integration/stash/recording.json index e73c9e3cb..48fc35158 100644 --- a/test/integration/stash/recording.json +++ b/test/integration/stash/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":1218,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1555,"Mod":0,"Key":256,"Ch":83},{"Timestamp":1868,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2116,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2411,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2459,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2523,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2955,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4059,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4355,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5611,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6427,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6483,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6522,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6907,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7563,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7819,"Mod":0,"Key":259,"Ch":0},{"Timestamp":8139,"Mod":0,"Key":259,"Ch":0},{"Timestamp":8491,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9067,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9843,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":809,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1369,"Mod":0,"Key":256,"Ch":83},{"Timestamp":1713,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2087,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2376,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2440,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2512,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2793,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3498,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4113,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4785,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5145,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5183,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5249,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5609,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6216,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6457,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6728,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7098,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8080,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8752,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8952,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9145,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9904,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashDrop/expected/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/stashDrop/expected/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/stashFiles/expected/.git_keep/FETCH_HEAD b/test/integration/stashDrop/expected/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/FETCH_HEAD rename to test/integration/stashDrop/expected/.git_keep/FETCH_HEAD diff --git a/test/integration/stashFiles/expected/.git_keep/HEAD b/test/integration/stashDrop/expected/.git_keep/HEAD similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/HEAD rename to test/integration/stashDrop/expected/.git_keep/HEAD diff --git a/test/integration/stashDrop/expected/.git_keep/ORIG_HEAD b/test/integration/stashDrop/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..0a7c9cc2b --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +d22496528fe3c076a668c496ae7ba1f8136f1614 diff --git a/test/integration/stashFiles/expected/.git_keep/config b/test/integration/stashDrop/expected/.git_keep/config similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/config rename to test/integration/stashDrop/expected/.git_keep/config diff --git a/test/integration/stashFiles/expected/.git_keep/description b/test/integration/stashDrop/expected/.git_keep/description similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/description rename to test/integration/stashDrop/expected/.git_keep/description diff --git a/test/integration/stashDrop/expected/.git_keep/index b/test/integration/stashDrop/expected/.git_keep/index new file mode 100644 index 000000000..44fe0833f Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/index differ diff --git a/test/integration/stashFiles/expected/.git_keep/info/exclude b/test/integration/stashDrop/expected/.git_keep/info/exclude similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/info/exclude rename to test/integration/stashDrop/expected/.git_keep/info/exclude diff --git a/test/integration/stashDrop/expected/.git_keep/logs/HEAD b/test/integration/stashDrop/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..b2e6d1769 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 c00c9eb1ae239494475772c3f3dbae5ea4169575 CI 1643011799 +1100 commit (initial): file0 +c00c9eb1ae239494475772c3f3dbae5ea4169575 7605fecac5dee01fb9df55ca984dcc7a72810f48 CI 1643011799 +1100 commit: file1 +7605fecac5dee01fb9df55ca984dcc7a72810f48 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011799 +1100 commit: file2 +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011803 +1100 reset: moving to HEAD +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011803 +1100 reset: moving to HEAD +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011806 +1100 reset: moving to HEAD +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011806 +1100 reset: moving to HEAD diff --git a/test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master b/test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..62c5e5c79 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 c00c9eb1ae239494475772c3f3dbae5ea4169575 CI 1643011799 +1100 commit (initial): file0 +c00c9eb1ae239494475772c3f3dbae5ea4169575 7605fecac5dee01fb9df55ca984dcc7a72810f48 CI 1643011799 +1100 commit: file1 +7605fecac5dee01fb9df55ca984dcc7a72810f48 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011799 +1100 commit: file2 diff --git a/test/integration/stashDrop/expected/.git_keep/logs/refs/stash b/test/integration/stashDrop/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..0b47b5c2e --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f4f81b6542e98a2f80269449674b0f8f454b74b0 CI 1643011806 +1100 On master: dsa diff --git a/test/integration/stashFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/stashDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/stashFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashDrop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/stashDrop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b b/test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b new file mode 100644 index 000000000..24145cefe Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b differ diff --git a/test/integration/stashFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashDrop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/stashDrop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/stashDrop/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stashDrop/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 new file mode 100644 index 000000000..8535af67c Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 differ diff --git a/test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 000000000..6a6f24362 Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 differ diff --git a/test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 @@ -0,0 +1,3 @@ +x+)JMUd040031QHI5`ֶww.hT[H + e"ǨS,gu"YH +$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 b/test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 new file mode 100644 index 000000000..6d84f0e3f Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 differ diff --git a/test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 b/test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 new file mode 100644 index 000000000..782d5f0ee Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 differ diff --git a/test/integration/stashFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashDrop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/stashDrop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/stashDrop/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stashDrop/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c new file mode 100644 index 000000000..539f97919 Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c differ diff --git a/test/integration/stashFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/stashDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac b/test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac new file mode 100644 index 000000000..20498e40d Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac differ diff --git a/test/integration/stashDrop/expected/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 b/test/integration/stashDrop/expected/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 new file mode 100644 index 000000000..3a5979b5c --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 @@ -0,0 +1,2 @@ +xA +0Fa9I#i`R"x|{޼tS 1Yr!VToPS.}ki>NO|S{[{X$Yt]]V?+ \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashDrop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a rename to test/integration/stashDrop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a diff --git a/test/integration/stashFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashDrop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/stashDrop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 b/test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 new file mode 100644 index 000000000..ce64e7f52 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 @@ -0,0 +1,3 @@ +x1 +0 @>B8BC%\#tV<})gEpg=ɝ-0V: \ No newline at end of file diff --git a/test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b b/test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b new file mode 100644 index 000000000..57420d027 Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b differ diff --git a/test/integration/stashDrop/expected/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 b/test/integration/stashDrop/expected/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 new file mode 100644 index 000000000..965e28b60 Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 differ diff --git a/test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 b/test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 new file mode 100644 index 000000000..0c09e49d2 Binary files /dev/null and b/test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 differ diff --git a/test/integration/stashDrop/expected/.git_keep/refs/heads/master b/test/integration/stashDrop/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..0a7c9cc2b --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +d22496528fe3c076a668c496ae7ba1f8136f1614 diff --git a/test/integration/stashDrop/expected/.git_keep/refs/stash b/test/integration/stashDrop/expected/.git_keep/refs/stash new file mode 100644 index 000000000..0a4ae7ab5 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/refs/stash @@ -0,0 +1 @@ +f4f81b6542e98a2f80269449674b0f8f454b74b0 diff --git a/test/integration/stashFiles/expected/file0 b/test/integration/stashDrop/expected/file0 similarity index 100% rename from test/integration/stashFiles/expected/file0 rename to test/integration/stashDrop/expected/file0 diff --git a/test/integration/stashDrop/expected/file1 b/test/integration/stashDrop/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/stashDrop/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/stashFiles/expected/file2 b/test/integration/stashDrop/expected/file2 similarity index 100% rename from test/integration/stashFiles/expected/file2 rename to test/integration/stashDrop/expected/file2 diff --git a/test/integration/stashDrop/recording.json b/test/integration/stashDrop/recording.json new file mode 100644 index 000000000..c61c97b24 --- /dev/null +++ b/test/integration/stashDrop/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1329,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2003,"Mod":0,"Key":256,"Ch":83},{"Timestamp":2466,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2754,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2979,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3051,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3081,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3386,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3961,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4186,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4906,"Mod":0,"Key":256,"Ch":83},{"Timestamp":5394,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5626,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6002,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6066,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6113,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6378,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6842,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7074,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7315,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7714,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8114,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8546,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9379,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashFiles/setup.sh b/test/integration/stashDrop/setup.sh similarity index 100% rename from test/integration/stashFiles/setup.sh rename to test/integration/stashDrop/setup.sh diff --git a/test/integration/stashDrop/test.json b/test/integration/stashDrop/test.json new file mode 100644 index 000000000..7cb436f8f --- /dev/null +++ b/test/integration/stashDrop/test.json @@ -0,0 +1,4 @@ +{ + "description": "Stashing some files", + "speed": 20 +} diff --git a/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD b/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 52c8d5849..000000000 --- a/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 diff --git a/test/integration/stashFiles/expected/.git_keep/index b/test/integration/stashFiles/expected/.git_keep/index deleted file mode 100644 index 5f67258e9..000000000 Binary files a/test/integration/stashFiles/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/stashFiles/expected/.git_keep/logs/HEAD b/test/integration/stashFiles/expected/.git_keep/logs/HEAD deleted file mode 100644 index b5128c522..000000000 --- a/test/integration/stashFiles/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 5e1c4f2926fa291fbd2f95095429c75bc1148693 CI 1617674625 +1000 commit (initial): file0 -5e1c4f2926fa291fbd2f95095429c75bc1148693 143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 CI 1617674625 +1000 commit: file1 -143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674625 +1000 commit: file2 -ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674628 +1000 reset: moving to HEAD diff --git a/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master b/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 93b075067..000000000 --- a/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 5e1c4f2926fa291fbd2f95095429c75bc1148693 CI 1617674625 +1000 commit (initial): file0 -5e1c4f2926fa291fbd2f95095429c75bc1148693 143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 CI 1617674625 +1000 commit: file1 -143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674625 +1000 commit: file2 diff --git a/test/integration/stashFiles/expected/.git_keep/logs/refs/stash b/test/integration/stashFiles/expected/.git_keep/logs/refs/stash deleted file mode 100644 index af582ad3d..000000000 --- a/test/integration/stashFiles/expected/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 6ca18002905d50a6a77808f8b7d50839f68da7b7 CI 1617674628 +1000 On master: asd diff --git a/test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 b/test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 deleted file mode 100644 index d3160cfee..000000000 Binary files a/test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 and /dev/null differ diff --git a/test/integration/stashFiles/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashFiles/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da deleted file mode 100644 index ea6cd3866..000000000 Binary files a/test/integration/stashFiles/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da and /dev/null differ diff --git a/test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 b/test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 deleted file mode 100644 index 6ff9310ea..000000000 Binary files a/test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 and /dev/null differ diff --git a/test/integration/stashFiles/expected/.git_keep/objects/6c/a18002905d50a6a77808f8b7d50839f68da7b7 b/test/integration/stashFiles/expected/.git_keep/objects/6c/a18002905d50a6a77808f8b7d50839f68da7b7 deleted file mode 100644 index ae0db48fe..000000000 --- a/test/integration/stashFiles/expected/.git_keep/objects/6c/a18002905d50a6a77808f8b7d50839f68da7b7 +++ /dev/null @@ -1 +0,0 @@ -xϱj1 E|:Ȕ [2-Թpq [w)=`΍ S2$F`Rtͯ#KE'J [W) +4 C`D,RKVUrI{>ϗ?~"DžĘ!}b?u ]zJ \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac b/test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac deleted file mode 100644 index 2aab99cd8..000000000 Binary files a/test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac and /dev/null differ diff --git a/test/integration/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 b/test/integration/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 deleted file mode 100644 index 4803fd8cf..000000000 --- a/test/integration/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E] LDzdfƖ#׺6'SNJ&!TrZ"'!39ҩ.!3KSE)$DU -CtK>v^}^M{}X=h9gO57e': \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/refs/heads/master b/test/integration/stashFiles/expected/.git_keep/refs/heads/master deleted file mode 100644 index 52c8d5849..000000000 --- a/test/integration/stashFiles/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 diff --git a/test/integration/stashFiles/expected/.git_keep/refs/stash b/test/integration/stashFiles/expected/.git_keep/refs/stash deleted file mode 100644 index 4b3a3a692..000000000 --- a/test/integration/stashFiles/expected/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -6ca18002905d50a6a77808f8b7d50839f68da7b7 diff --git a/test/integration/stashFiles/recording.json b/test/integration/stashFiles/recording.json deleted file mode 100644 index e1b1132ad..000000000 --- a/test/integration/stashFiles/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1237,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1677,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1925,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1965,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2053,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2365,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2709,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2941,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3172,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3629,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3973,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4237,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4325,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4477,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4701,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5157,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5957,"Mod":2,"Key":16,"Ch":16},{"Timestamp":6725,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6997,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7613,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashNewBranch/expected/.git_keep/index b/test/integration/stashNewBranch/expected/.git_keep/index index f73149efa..7d5c3c25b 100644 Binary files a/test/integration/stashNewBranch/expected/.git_keep/index and b/test/integration/stashNewBranch/expected/.git_keep/index differ diff --git a/test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stashPop/expected/.git_keep/FETCH_HEAD b/test/integration/stashPop/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashPop/expected/.git_keep/HEAD b/test/integration/stashPop/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stashPop/expected/.git_keep/ORIG_HEAD b/test/integration/stashPop/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..8e8f6abd0 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +8634432ef171aa4b8d8e688fc1e5645245bf36ac diff --git a/test/integration/stashPop/expected/.git_keep/config b/test/integration/stashPop/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stashPop/expected/.git_keep/description b/test/integration/stashPop/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashPop/expected/.git_keep/index b/test/integration/stashPop/expected/.git_keep/index new file mode 100644 index 000000000..1c25c6cf6 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/index differ diff --git a/test/integration/stashPop/expected/.git_keep/info/exclude b/test/integration/stashPop/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/stashPop/expected/.git_keep/logs/HEAD b/test/integration/stashPop/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..36f584bdf --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 8b081dcb0e1fd5e9862d1aa6891b805b101abe7b CI 1643011851 +1100 commit (initial): file0 +8b081dcb0e1fd5e9862d1aa6891b805b101abe7b 3ae4e5d4920afbb1bac23426afb237524c8dbe41 CI 1643011851 +1100 commit: file1 +3ae4e5d4920afbb1bac23426afb237524c8dbe41 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011852 +1100 commit: file2 +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011854 +1100 reset: moving to HEAD +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011854 +1100 reset: moving to HEAD +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011856 +1100 reset: moving to HEAD +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011856 +1100 reset: moving to HEAD diff --git a/test/integration/stashPop/expected/.git_keep/logs/refs/heads/master b/test/integration/stashPop/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..5493552ad --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 8b081dcb0e1fd5e9862d1aa6891b805b101abe7b CI 1643011851 +1100 commit (initial): file0 +8b081dcb0e1fd5e9862d1aa6891b805b101abe7b 3ae4e5d4920afbb1bac23426afb237524c8dbe41 CI 1643011851 +1100 commit: file1 +3ae4e5d4920afbb1bac23426afb237524c8dbe41 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011852 +1100 commit: file2 diff --git a/test/integration/stashPop/expected/.git_keep/logs/refs/stash b/test/integration/stashPop/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..4a66ec164 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 437b9b0ca941f1e12c8b45958f5d6ebd11cdd41a CI 1643011856 +1100 On master: asd diff --git a/test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashPop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 b/test/integration/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 new file mode 100644 index 000000000..aa0e72eed Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a b/test/integration/stashPop/expected/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a new file mode 100644 index 000000000..38198edd1 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a @@ -0,0 +1 @@ +xϱj1 E%YWJ dgm\M|_1>gOswTDɍkX[nfPID)znjfTj,đ$V|&MdAՆyr lܿn-PDe 'D=~cJ) \ No newline at end of file diff --git a/test/integration/stashPop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashPop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 000000000..6a6f24362 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 @@ -0,0 +1,3 @@ +x+)JMUd040031QHI5`ֶww.hT[H + e"ǨS,gu"YH +$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 b/test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 new file mode 100644 index 000000000..1794b8694 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac b/test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac new file mode 100644 index 000000000..24d309c9e Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b b/test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b new file mode 100644 index 000000000..e730193f1 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 b/test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 new file mode 100644 index 000000000..4541e3cc9 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stashPop/expected/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 new file mode 100644 index 000000000..2a1928079 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashPop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e b/test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e new file mode 100644 index 000000000..8ebf85670 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 b/test/integration/stashPop/expected/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 new file mode 100644 index 000000000..6f47ae7a5 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 @@ -0,0 +1 @@ +xj1 @;Wh/˖e](le[8.sK;g}7~ٿ IJk\wLcls9'kb馛]aBURX=k});9-權dGA'TK4^78.~\>v@%2":7t>}-'XgoM} \ No newline at end of file diff --git a/test/integration/stashPop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashPop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 000000000..ee4385f12 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a differ diff --git a/test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c b/test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c new file mode 100644 index 000000000..026ea2da1 Binary files /dev/null and b/test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c differ diff --git a/test/integration/stashPop/expected/.git_keep/refs/heads/master b/test/integration/stashPop/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..8e8f6abd0 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +8634432ef171aa4b8d8e688fc1e5645245bf36ac diff --git a/test/integration/stashPop/expected/.git_keep/refs/stash b/test/integration/stashPop/expected/.git_keep/refs/stash new file mode 100644 index 000000000..86ea2c9b3 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/refs/stash @@ -0,0 +1 @@ +437b9b0ca941f1e12c8b45958f5d6ebd11cdd41a diff --git a/test/integration/stashPop/expected/file0 b/test/integration/stashPop/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stashPop/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stashFiles/expected/file1 b/test/integration/stashPop/expected/file1 similarity index 100% rename from test/integration/stashFiles/expected/file1 rename to test/integration/stashPop/expected/file1 diff --git a/test/integration/stashPop/expected/file2 b/test/integration/stashPop/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/stashPop/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/stashFiles/expected/file3 b/test/integration/stashPop/expected/file3 similarity index 100% rename from test/integration/stashFiles/expected/file3 rename to test/integration/stashPop/expected/file3 diff --git a/test/integration/stashPop/recording.json b/test/integration/stashPop/recording.json new file mode 100644 index 000000000..8629fa444 --- /dev/null +++ b/test/integration/stashPop/recording.json @@ -0,0 +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 diff --git a/test/integration/stashPop/setup.sh b/test/integration/stashPop/setup.sh new file mode 100644 index 000000000..7b6eea95c --- /dev/null +++ b/test/integration/stashPop/setup.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "hello there" > file1 +echo "hello there" > file2 +echo "hello there" > file3 diff --git a/test/integration/stashPop/test.json b/test/integration/stashPop/test.json new file mode 100644 index 000000000..7cb436f8f --- /dev/null +++ b/test/integration/stashPop/test.json @@ -0,0 +1,4 @@ +{ + "description": "Stashing some files", + "speed": 20 +} diff --git a/test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stash_Copy/expected/.git_keep/FETCH_HEAD b/test/integration/stash_Copy/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stash_Copy/expected/.git_keep/HEAD b/test/integration/stash_Copy/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD b/test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..78e4eb58e --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +f348ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash_Copy/expected/.git_keep/config b/test/integration/stash_Copy/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stash_Copy/expected/.git_keep/description b/test/integration/stash_Copy/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stash_Copy/expected/.git_keep/index b/test/integration/stash_Copy/expected/.git_keep/index new file mode 100644 index 000000000..daebfa4ef Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/index differ diff --git a/test/integration/stash_Copy/expected/.git_keep/info/exclude b/test/integration/stash_Copy/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/HEAD b/test/integration/stash_Copy/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..f95cf06ac --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011558 +1100 reset: moving to HEAD diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master b/test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..d1bf421f8 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/refs/stash b/test/integration/stash_Copy/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..3f07cf22e --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/logs/refs/stash @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 CI 1643011556 +1100 On master: asd +e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 2efac8148440778cbddcd80ac7477981277dcffe CI 1643011558 +1100 On master: asd diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc b/test/integration/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc new file mode 100644 index 000000000..aab767a08 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe b/test/integration/stash_Copy/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe new file mode 100644 index 000000000..54545b630 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe @@ -0,0 +1 @@ +xAj1 4v)%UV=$˴Pgątg{bOpF[`X,`L ˶eQMl,y.5\FTeHJ3H:!5ER [.nj|^/׳H g2B@\:O '_o1 ȣK \ No newline at end of file diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stash_Copy/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a b/test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a new file mode 100644 index 000000000..1b8805172 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d b/test/integration/stash_Copy/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d new file mode 100644 index 000000000..bc099c320 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stash_Copy/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 new file mode 100644 index 000000000..8535af67c Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 000000000..6a6f24362 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 @@ -0,0 +1,3 @@ +x+)JMUd040031QHI5`ֶww.hT[H + e"ǨS,gu"YH +$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c new file mode 100644 index 000000000..539f97919 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 b/test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 new file mode 100644 index 000000000..0cdd88ea0 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b b/test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b new file mode 100644 index 000000000..9dcd075d6 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 000000000..ee4385f12 Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 b/test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 new file mode 100644 index 000000000..f57ce417b Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 b/test/integration/stash_Copy/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 new file mode 100644 index 000000000..8faee1fcd Binary files /dev/null and b/test/integration/stash_Copy/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 differ diff --git a/test/integration/stash_Copy/expected/.git_keep/refs/heads/master b/test/integration/stash_Copy/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..78e4eb58e --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +f348ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash_Copy/expected/.git_keep/refs/stash b/test/integration/stash_Copy/expected/.git_keep/refs/stash new file mode 100644 index 000000000..9123248e5 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/refs/stash @@ -0,0 +1 @@ +2efac8148440778cbddcd80ac7477981277dcffe diff --git a/test/integration/stash_Copy/expected/file0 b/test/integration/stash_Copy/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stash_Copy/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stash_Copy/expected/file1 b/test/integration/stash_Copy/expected/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stash_Copy/expected/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stash_Copy/expected/file2 b/test/integration/stash_Copy/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/stash_Copy/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/stash_Copy/recording.json b/test/integration/stash_Copy/recording.json new file mode 100644 index 000000000..48fc35158 --- /dev/null +++ b/test/integration/stash_Copy/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":809,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1369,"Mod":0,"Key":256,"Ch":83},{"Timestamp":1713,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2087,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2376,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2440,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2512,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2793,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3498,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4113,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4785,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5145,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5183,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5249,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5609,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6216,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6457,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6728,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7098,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8080,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8752,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8952,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9145,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9904,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stash_Copy/setup.sh b/test/integration/stash_Copy/setup.sh new file mode 100644 index 000000000..7b6eea95c --- /dev/null +++ b/test/integration/stash_Copy/setup.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "hello there" > file1 +echo "hello there" > file2 +echo "hello there" > file3 diff --git a/test/integration/stashFiles/test.json b/test/integration/stash_Copy/test.json similarity index 100% rename from test/integration/stashFiles/test.json rename to test/integration/stash_Copy/test.json