diff --git a/pkg/commands/git_commands/stash.go b/pkg/commands/git_commands/stash.go index 71b8f655b..c479d8610 100644 --- a/pkg/commands/git_commands/stash.go +++ b/pkg/commands/git_commands/stash.go @@ -53,7 +53,7 @@ func (self *StashCommands) StashAndKeepIndex(message string) error { } func (self *StashCommands) StashUnstagedChanges(message string) error { - if err := self.cmd.New("git commit -m \"WIP\"").Run(); err != nil { + if err := self.cmd.New("git commit --no-verify -m \"[lazygit] stashing unstaged changes\"").Run(); err != nil { return err } if err := self.Save(message); err != nil { diff --git a/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD index 78e4eb58e..70b2d64a5 100644 --- a/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -f348ff60bdbb3695f2f519db6bc115b1b8d50886 +6b1f87e5b74cd77d755d213e0850f4de02b3cdce diff --git a/test/integration/stash/expected/repo/.git_keep/config b/test/integration/stash/expected/repo/.git_keep/config index 8ae104545..596ebaeb3 100644 --- a/test/integration/stash/expected/repo/.git_keep/config +++ b/test/integration/stash/expected/repo/.git_keep/config @@ -3,8 +3,6 @@ filemode = true bare = false logallrefupdates = true - ignorecase = true - precomposeunicode = true [user] email = CI@example.com name = CI diff --git a/test/integration/stash/expected/repo/.git_keep/index b/test/integration/stash/expected/repo/.git_keep/index index daebfa4ef..1e08e2596 100644 Binary files a/test/integration/stash/expected/repo/.git_keep/index and b/test/integration/stash/expected/repo/.git_keep/index differ diff --git a/test/integration/stash/expected/repo/.git_keep/info/exclude b/test/integration/stash/expected/repo/.git_keep/info/exclude index 8e9f2071f..a5196d1be 100644 --- a/test/integration/stash/expected/repo/.git_keep/info/exclude +++ b/test/integration/stash/expected/repo/.git_keep/info/exclude @@ -4,4 +4,3 @@ # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~ -.DS_Store diff --git a/test/integration/stash/expected/repo/.git_keep/logs/HEAD b/test/integration/stash/expected/repo/.git_keep/logs/HEAD index f95cf06ac..d7185f04d 100644 --- a/test/integration/stash/expected/repo/.git_keep/logs/HEAD +++ b/test/integration/stash/expected/repo/.git_keep/logs/HEAD @@ -1,6 +1,5 @@ -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 +0000000000000000000000000000000000000000 8c3123f6f4cee663b57398072df088c6f2dfeb9b CI 1650002552 +0200 commit (initial): file0 +8c3123f6f4cee663b57398072df088c6f2dfeb9b f7114350b59290905115d7918efe144eb2c62a76 CI 1650002552 +0200 commit: file1 +f7114350b59290905115d7918efe144eb2c62a76 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002552 +0200 commit: file2 +6b1f87e5b74cd77d755d213e0850f4de02b3cdce 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002559 +0200 reset: moving to HEAD +6b1f87e5b74cd77d755d213e0850f4de02b3cdce 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002567 +0200 reset: moving to HEAD diff --git a/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master index d1bf421f8..cacae4d5c 100644 --- a/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 -a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 -4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 +0000000000000000000000000000000000000000 8c3123f6f4cee663b57398072df088c6f2dfeb9b CI 1650002552 +0200 commit (initial): file0 +8c3123f6f4cee663b57398072df088c6f2dfeb9b f7114350b59290905115d7918efe144eb2c62a76 CI 1650002552 +0200 commit: file1 +f7114350b59290905115d7918efe144eb2c62a76 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002552 +0200 commit: file2 diff --git a/test/integration/stash/expected/repo/.git_keep/logs/refs/stash b/test/integration/stash/expected/repo/.git_keep/logs/refs/stash index 3f07cf22e..bcf0a385b 100644 --- a/test/integration/stash/expected/repo/.git_keep/logs/refs/stash +++ b/test/integration/stash/expected/repo/.git_keep/logs/refs/stash @@ -1,2 +1 @@ -0000000000000000000000000000000000000000 e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 CI 1643011556 +1100 On master: asd -e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 2efac8148440778cbddcd80ac7477981277dcffe CI 1643011558 +1100 On master: asd +0000000000000000000000000000000000000000 be485112173592dea7b39c7efc3a6f52f43b71b9 CI 1650002559 +0200 On master: asd diff --git a/test/integration/stash/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc b/test/integration/stash/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc deleted file mode 100644 index aab767a08..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe b/test/integration/stash/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe deleted file mode 100644 index 54545b630..000000000 --- a/test/integration/stash/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe +++ /dev/null @@ -1 +0,0 @@ -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/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a b/test/integration/stash/expected/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a deleted file mode 100644 index 1b8805172..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d b/test/integration/stash/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d deleted file mode 100644 index bc099c320..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 b/test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 new file mode 100644 index 000000000..258a8ab01 --- /dev/null +++ b/test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 @@ -0,0 +1,2 @@ +xK +1D]I0aƽۢKֹѼxX\r6K068o%#cd-ev5ltpQBm̙ѓ',&N)'QmηU>O9V/!!ǰqF:YWm^cuYAbaA \ No newline at end of file diff --git a/test/integration/stash/expected/repo/.git_keep/objects/6b/1f87e5b74cd77d755d213e0850f4de02b3cdce b/test/integration/stash/expected/repo/.git_keep/objects/6b/1f87e5b74cd77d755d213e0850f4de02b3cdce new file mode 100644 index 000000000..51688c4dc Binary files /dev/null and b/test/integration/stash/expected/repo/.git_keep/objects/6b/1f87e5b74cd77d755d213e0850f4de02b3cdce differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 b/test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 new file mode 100644 index 000000000..b2cb857d0 --- /dev/null +++ b/test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 @@ -0,0 +1,2 @@ +x +0E]+f/$c*"BW<&X0Mf‰vf6H8s"b!I@HZkd&Ǧ191IɁ fUb,= i~KDTƌpF(:QŲ&>P*ˋBf \ No newline at end of file diff --git a/test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b b/test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b new file mode 100644 index 000000000..0ae4c30f4 --- /dev/null +++ b/test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b @@ -0,0 +1,3 @@ +xA +0Fa9ԀU4)znպtdqR!'hP6'z{YY0?) +6֒+ \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stash/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 similarity index 100% rename from test/integration/stashPop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 rename to test/integration/stash/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 diff --git a/test/integration/stash/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stash/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c deleted file mode 100644 index 539f97919..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 b/test/integration/stash/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 deleted file mode 100644 index 0cdd88ea0..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b b/test/integration/stash/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b deleted file mode 100644 index 9dcd075d6..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/be/485112173592dea7b39c7efc3a6f52f43b71b9 b/test/integration/stash/expected/repo/.git_keep/objects/be/485112173592dea7b39c7efc3a6f52f43b71b9 new file mode 100644 index 000000000..59e0babdb Binary files /dev/null and b/test/integration/stash/expected/repo/.git_keep/objects/be/485112173592dea7b39c7efc3a6f52f43b71b9 differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/be/be684962b7b3a4d751f95173b31a051c7d46e7 b/test/integration/stash/expected/repo/.git_keep/objects/be/be684962b7b3a4d751f95173b31a051c7d46e7 new file mode 100644 index 000000000..99d6b4097 Binary files /dev/null and b/test/integration/stash/expected/repo/.git_keep/objects/be/be684962b7b3a4d751f95173b31a051c7d46e7 differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 b/test/integration/stash/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 deleted file mode 100644 index f57ce417b..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 b/test/integration/stash/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 deleted file mode 100644 index 8faee1fcd..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/f7/114350b59290905115d7918efe144eb2c62a76 b/test/integration/stash/expected/repo/.git_keep/objects/f7/114350b59290905115d7918efe144eb2c62a76 new file mode 100644 index 000000000..734e0f0c1 Binary files /dev/null and b/test/integration/stash/expected/repo/.git_keep/objects/f7/114350b59290905115d7918efe144eb2c62a76 differ diff --git a/test/integration/stash/expected/repo/.git_keep/refs/heads/master b/test/integration/stash/expected/repo/.git_keep/refs/heads/master index 78e4eb58e..70b2d64a5 100644 --- a/test/integration/stash/expected/repo/.git_keep/refs/heads/master +++ b/test/integration/stash/expected/repo/.git_keep/refs/heads/master @@ -1 +1 @@ -f348ff60bdbb3695f2f519db6bc115b1b8d50886 +6b1f87e5b74cd77d755d213e0850f4de02b3cdce diff --git a/test/integration/stash/expected/repo/.git_keep/refs/stash b/test/integration/stash/expected/repo/.git_keep/refs/stash index 9123248e5..e627ae765 100644 --- a/test/integration/stash/expected/repo/.git_keep/refs/stash +++ b/test/integration/stash/expected/repo/.git_keep/refs/stash @@ -1 +1 @@ -2efac8148440778cbddcd80ac7477981277dcffe +be485112173592dea7b39c7efc3a6f52f43b71b9 diff --git a/test/integration/stash/expected/repo/file2 b/test/integration/stash/expected/repo/file2 index 180cf8328..c7c7da3c6 100644 --- a/test/integration/stash/expected/repo/file2 +++ b/test/integration/stash/expected/repo/file2 @@ -1 +1 @@ -test2 +hello there diff --git a/test/integration/stash/expected/repo/file3 b/test/integration/stash/expected/repo/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stash/expected/repo/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stash/recording.json b/test/integration/stash/recording.json index 48fc35158..cefefc363 100644 --- a/test/integration/stash/recording.json +++ b/test/integration/stash/recording.json @@ -1 +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 +{"KeyEvents":[{"Timestamp":1303,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1922,"Mod":0,"Key":256,"Ch":83},{"Timestamp":5480,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6417,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6506,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6549,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6874,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7610,"Mod":0,"Key":256,"Ch":53},{"Timestamp":9010,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10900,"Mod":0,"Key":256,"Ch":50},{"Timestamp":11662,"Mod":0,"Key":256,"Ch":107},{"Timestamp":12360,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12902,"Mod":0,"Key":256,"Ch":115},{"Timestamp":13687,"Mod":0,"Key":256,"Ch":97},{"Timestamp":13772,"Mod":0,"Key":256,"Ch":115},{"Timestamp":13837,"Mod":0,"Key":256,"Ch":100},{"Timestamp":14294,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15489,"Mod":0,"Key":256,"Ch":53},{"Timestamp":16960,"Mod":0,"Key":256,"Ch":103},{"Timestamp":17726,"Mod":0,"Key":13,"Ch":13},{"Timestamp":18592,"Mod":0,"Key":256,"Ch":50},{"Timestamp":19603,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..edd32295e --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +8fa874178500f99d69f649ff9128f3d1b62369a0 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/config b/test/integration/stashAllChanges/expected/repo/.git_keep/config new file mode 100644 index 000000000..596ebaeb3 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/description b/test/integration/stashAllChanges/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/index b/test/integration/stashAllChanges/expected/repo/.git_keep/index new file mode 100644 index 000000000..afb46a953 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/index differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude b/test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude @@ -0,0 +1,6 @@ +# 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] +# *~ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..c920669ff --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 CI 1650002283 +0200 commit (initial): file0 +29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 624317ac2731648d4b0e30068dd35aca2a0b4791 CI 1650002283 +0200 commit: file1 +624317ac2731648d4b0e30068dd35aca2a0b4791 8fa874178500f99d69f649ff9128f3d1b62369a0 CI 1650002283 +0200 commit: file2 +8fa874178500f99d69f649ff9128f3d1b62369a0 8fa874178500f99d69f649ff9128f3d1b62369a0 CI 1650002287 +0200 reset: moving to HEAD +8fa874178500f99d69f649ff9128f3d1b62369a0 8fa874178500f99d69f649ff9128f3d1b62369a0 CI 1650002295 +0200 reset: moving to HEAD +8fa874178500f99d69f649ff9128f3d1b62369a0 8fa874178500f99d69f649ff9128f3d1b62369a0 CI 1650002303 +0200 reset: moving to HEAD diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..89fb0a652 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 CI 1650002283 +0200 commit (initial): file0 +29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 624317ac2731648d4b0e30068dd35aca2a0b4791 CI 1650002283 +0200 commit: file1 +624317ac2731648d4b0e30068dd35aca2a0b4791 8fa874178500f99d69f649ff9128f3d1b62369a0 CI 1650002283 +0200 commit: file2 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da new file mode 100644 index 000000000..ea6cd3866 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 new file mode 100644 index 000000000..efe9bb1f3 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 @@ -0,0 +1,3 @@ +xA +0FsdR +CMw+L,3-vbnz׽.qBj,VEuAW$M|#ü[R.(CUa)j,ǚؘYE'UK:8e[dbZ0;J6h ["DxTVB)g7g_Ngx9[OekC qx?~&pt9V4hP \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 new file mode 100644 index 000000000..2a1928079 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8f/a874178500f99d69f649ff9128f3d1b62369a0 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8f/a874178500f99d69f649ff9128f3d1b62369a0 new file mode 100644 index 000000000..4dea954a6 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8f/a874178500f99d69f649ff9128f3d1b62369a0 differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/b1/dfa9f82f0821f9decd33c52c9bfe0f0ff86b41 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/b1/dfa9f82f0821f9decd33c52c9bfe0f0ff86b41 new file mode 100644 index 000000000..617e1b1b7 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/b1/dfa9f82f0821f9decd33c52c9bfe0f0ff86b41 differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 000000000..ee4385f12 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.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/stashAllChanges/expected/repo/.git_keep/objects/d7/cc3e41ea34ee3f9441b3a1493405d34f15c1cd b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/d7/cc3e41ea34ee3f9441b3a1493405d34f15c1cd new file mode 100644 index 000000000..4379cd5d8 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/d7/cc3e41ea34ee3f9441b3a1493405d34f15c1cd @@ -0,0 +1 @@ +xϻJAay鮮ZD6o=̴o$榇^{LcPf,NQp%-aVLY3e4,ѹZXc`59;͒HEH)I18dnpZo)<gQ#<:tn:#bmnOۯԯG-=N^ \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/f9/0ee43c5ddc18a1341e5d77f2319e4e00e5effc b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/f9/0ee43c5ddc18a1341e5d77f2319e4e00e5effc new file mode 100644 index 000000000..9a5aa9571 Binary files /dev/null and b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/f9/0ee43c5ddc18a1341e5d77f2319e4e00e5effc differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..edd32295e --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +8fa874178500f99d69f649ff9128f3d1b62369a0 diff --git a/test/integration/stashAllChanges/expected/repo/file0 b/test/integration/stashAllChanges/expected/repo/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stashAllChanges/expected/repo/file1 b/test/integration/stashAllChanges/expected/repo/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashAllChanges/expected/repo/file2 b/test/integration/stashAllChanges/expected/repo/file2 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/file2 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashAllChanges/expected/repo/file3 b/test/integration/stashAllChanges/expected/repo/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashAllChanges/recording.json b/test/integration/stashAllChanges/recording.json new file mode 100644 index 000000000..85f2d1968 --- /dev/null +++ b/test/integration/stashAllChanges/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1107,"Mod":0,"Key":256,"Ch":83},{"Timestamp":1736,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2531,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2623,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2684,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2784,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3312,"Mod":0,"Key":256,"Ch":104},{"Timestamp":3400,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3468,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3583,"Mod":0,"Key":256,"Ch":108},{"Timestamp":3716,"Mod":0,"Key":256,"Ch":108},{"Timestamp":3913,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4284,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4420,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4707,"Mod":0,"Key":256,"Ch":108},{"Timestamp":5231,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5940,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6733,"Mod":0,"Key":256,"Ch":50},{"Timestamp":7944,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8694,"Mod":0,"Key":256,"Ch":83},{"Timestamp":9487,"Mod":0,"Key":256,"Ch":97},{"Timestamp":9952,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10041,"Mod":0,"Key":256,"Ch":116},{"Timestamp":10092,"Mod":0,"Key":256,"Ch":97},{"Timestamp":10166,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10253,"Mod":0,"Key":256,"Ch":104},{"Timestamp":10381,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10610,"Mod":0,"Key":256,"Ch":110},{"Timestamp":10718,"Mod":0,"Key":256,"Ch":101},{"Timestamp":10869,"Mod":0,"Key":256,"Ch":119},{"Timestamp":10938,"Mod":0,"Key":256,"Ch":108},{"Timestamp":11071,"Mod":0,"Key":256,"Ch":121},{"Timestamp":11129,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11279,"Mod":0,"Key":256,"Ch":116},{"Timestamp":11676,"Mod":0,"Key":256,"Ch":114},{"Timestamp":11753,"Mod":0,"Key":256,"Ch":97},{"Timestamp":11874,"Mod":0,"Key":256,"Ch":99},{"Timestamp":11984,"Mod":0,"Key":256,"Ch":107},{"Timestamp":12025,"Mod":0,"Key":256,"Ch":101},{"Timestamp":12125,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12341,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12925,"Mod":0,"Key":256,"Ch":53},{"Timestamp":14343,"Mod":0,"Key":256,"Ch":103},{"Timestamp":14871,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15775,"Mod":0,"Key":256,"Ch":50},{"Timestamp":16168,"Mod":0,"Key":256,"Ch":106},{"Timestamp":16308,"Mod":0,"Key":256,"Ch":106},{"Timestamp":16515,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16850,"Mod":0,"Key":256,"Ch":107},{"Timestamp":17159,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18125,"Mod":0,"Key":256,"Ch":83},{"Timestamp":18639,"Mod":0,"Key":256,"Ch":97},{"Timestamp":18972,"Mod":0,"Key":256,"Ch":115},{"Timestamp":19060,"Mod":0,"Key":256,"Ch":116},{"Timestamp":19168,"Mod":0,"Key":256,"Ch":97},{"Timestamp":19236,"Mod":0,"Key":256,"Ch":115},{"Timestamp":19405,"Mod":0,"Key":256,"Ch":104},{"Timestamp":19593,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19857,"Mod":0,"Key":256,"Ch":119},{"Timestamp":19942,"Mod":0,"Key":256,"Ch":105},{"Timestamp":20012,"Mod":0,"Key":256,"Ch":116},{"Timestamp":20072,"Mod":0,"Key":256,"Ch":104},{"Timestamp":20128,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20188,"Mod":0,"Key":256,"Ch":115},{"Timestamp":20251,"Mod":0,"Key":256,"Ch":116},{"Timestamp":20335,"Mod":0,"Key":256,"Ch":97},{"Timestamp":20432,"Mod":0,"Key":256,"Ch":103},{"Timestamp":20471,"Mod":0,"Key":256,"Ch":101},{"Timestamp":20606,"Mod":0,"Key":256,"Ch":100},{"Timestamp":20789,"Mod":0,"Key":13,"Ch":13},{"Timestamp":21429,"Mod":0,"Key":256,"Ch":53},{"Timestamp":22402,"Mod":0,"Key":256,"Ch":103},{"Timestamp":23066,"Mod":0,"Key":13,"Ch":13},{"Timestamp":24259,"Mod":0,"Key":256,"Ch":104},{"Timestamp":24394,"Mod":0,"Key":256,"Ch":104},{"Timestamp":24532,"Mod":0,"Key":256,"Ch":104},{"Timestamp":24793,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} \ No newline at end of file diff --git a/test/integration/stashAllChanges/setup.sh b/test/integration/stashAllChanges/setup.sh new file mode 100644 index 000000000..caff56b7d --- /dev/null +++ b/test/integration/stashAllChanges/setup.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +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/stashAllChanges/test.json b/test/integration/stashAllChanges/test.json new file mode 100644 index 000000000..645b63f7f --- /dev/null +++ b/test/integration/stashAllChanges/test.json @@ -0,0 +1 @@ +{ "description": "Stashing all files", "speed": 5 } diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..98460a0ae --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +e55d4f76f2b99c3b6b0c960725099ae54e34af70 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config new file mode 100644 index 000000000..596ebaeb3 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/description b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/index b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/index new file mode 100644 index 000000000..e633e1ab1 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/index differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude @@ -0,0 +1,6 @@ +# 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] +# *~ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..26e835cdd --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 783b58a50bb867917c6a8a78ff18cadb3fdc771e CI 1650002378 +0200 commit (initial): file0 +783b58a50bb867917c6a8a78ff18cadb3fdc771e e221db5981b482fb2110c8b283f48c08cd5f10c3 CI 1650002378 +0200 commit: file1 +e221db5981b482fb2110c8b283f48c08cd5f10c3 e55d4f76f2b99c3b6b0c960725099ae54e34af70 CI 1650002378 +0200 commit: file2 +e55d4f76f2b99c3b6b0c960725099ae54e34af70 e55d4f76f2b99c3b6b0c960725099ae54e34af70 CI 1650002384 +0200 reset: moving to HEAD diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..3032aa450 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 783b58a50bb867917c6a8a78ff18cadb3fdc771e CI 1650002378 +0200 commit (initial): file0 +783b58a50bb867917c6a8a78ff18cadb3fdc771e e221db5981b482fb2110c8b283f48c08cd5f10c3 CI 1650002378 +0200 commit: file1 +e221db5981b482fb2110c8b283f48c08cd5f10c3 e55d4f76f2b99c3b6b0c960725099ae54e34af70 CI 1650002378 +0200 commit: file2 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/24/35f1f9565ecb370eb550f591d55179f1e9a7de b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/24/35f1f9565ecb370eb550f591d55179f1e9a7de new file mode 100644 index 000000000..63c3eaa11 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/24/35f1f9565ecb370eb550f591d55179f1e9a7de differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 000000000..6a6f24362 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.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/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/78/3b58a50bb867917c6a8a78ff18cadb3fdc771e b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/78/3b58a50bb867917c6a8a78ff18cadb3fdc771e new file mode 100644 index 000000000..620eb2ec8 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/78/3b58a50bb867917c6a8a78ff18cadb3fdc771e differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/8f/bffdd316c764e171c3e421205327588077f49c b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/8f/bffdd316c764e171c3e421205327588077f49c new file mode 100644 index 000000000..f22bfcca1 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/8f/bffdd316c764e171c3e421205327588077f49c @@ -0,0 +1 @@ +xϻj1atB0rgIgIZ?~Iqo<߆ Oc7AOb!Zjip`JPEZRL%0(8!&B>M8q 2싘hg|\zC/mߝLD!{@41O>},n_M \ No newline at end of file diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 000000000..ee4385f12 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.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/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e2/21db5981b482fb2110c8b283f48c08cd5f10c3 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e2/21db5981b482fb2110c8b283f48c08cd5f10c3 new file mode 100644 index 000000000..346dbdc7d Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e2/21db5981b482fb2110c8b283f48c08cd5f10c3 differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e5/5d4f76f2b99c3b6b0c960725099ae54e34af70 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e5/5d4f76f2b99c3b6b0c960725099ae54e34af70 new file mode 100644 index 000000000..5db901623 Binary files /dev/null and b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e5/5d4f76f2b99c3b6b0c960725099ae54e34af70 differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/heads/master b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..98460a0ae --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +e55d4f76f2b99c3b6b0c960725099ae54e34af70 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file0 b/test/integration/stashAllChangesKeepIndex/expected/repo/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file1 b/test/integration/stashAllChangesKeepIndex/expected/repo/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file2 b/test/integration/stashAllChangesKeepIndex/expected/repo/file2 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/file2 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file3 b/test/integration/stashAllChangesKeepIndex/expected/repo/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/expected/repo/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashAllChangesKeepIndex/recording.json b/test/integration/stashAllChangesKeepIndex/recording.json new file mode 100644 index 000000000..353ca2ae6 --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1343,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1895,"Mod":0,"Key":256,"Ch":83},{"Timestamp":3116,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4389,"Mod":0,"Key":256,"Ch":107},{"Timestamp":4458,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4571,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4656,"Mod":0,"Key":256,"Ch":112},{"Timestamp":4742,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4834,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4908,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4965,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5013,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5162,"Mod":0,"Key":256,"Ch":120},{"Timestamp":5500,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6822,"Mod":0,"Key":256,"Ch":53},{"Timestamp":8093,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8985,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9950,"Mod":0,"Key":256,"Ch":49},{"Timestamp":10588,"Mod":0,"Key":256,"Ch":106},{"Timestamp":11171,"Mod":0,"Key":256,"Ch":50},{"Timestamp":11581,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12392,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} \ No newline at end of file diff --git a/test/integration/stashAllChangesKeepIndex/setup.sh b/test/integration/stashAllChangesKeepIndex/setup.sh new file mode 100644 index 000000000..caff56b7d --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/setup.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +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/stashAllChangesKeepIndex/test.json b/test/integration/stashAllChangesKeepIndex/test.json new file mode 100644 index 000000000..4f9314caa --- /dev/null +++ b/test/integration/stashAllChangesKeepIndex/test.json @@ -0,0 +1 @@ +{ "description": "Stashing some files", "speed": 5 } diff --git a/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD index 0a7c9cc2b..7bd761f02 100644 --- a/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -d22496528fe3c076a668c496ae7ba1f8136f1614 +f1963e622e30276cf4e5880109ea475434d6f2ae diff --git a/test/integration/stashDrop/expected/repo/.git_keep/config b/test/integration/stashDrop/expected/repo/.git_keep/config index 8ae104545..596ebaeb3 100644 --- a/test/integration/stashDrop/expected/repo/.git_keep/config +++ b/test/integration/stashDrop/expected/repo/.git_keep/config @@ -3,8 +3,6 @@ filemode = true bare = false logallrefupdates = true - ignorecase = true - precomposeunicode = true [user] email = CI@example.com name = CI diff --git a/test/integration/stashDrop/expected/repo/.git_keep/index b/test/integration/stashDrop/expected/repo/.git_keep/index index 44fe0833f..8256e1e36 100644 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/index and b/test/integration/stashDrop/expected/repo/.git_keep/index differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/info/exclude b/test/integration/stashDrop/expected/repo/.git_keep/info/exclude index 8e9f2071f..a5196d1be 100644 --- a/test/integration/stashDrop/expected/repo/.git_keep/info/exclude +++ b/test/integration/stashDrop/expected/repo/.git_keep/info/exclude @@ -4,4 +4,3 @@ # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~ -.DS_Store diff --git a/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD b/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD index b2e6d1769..96a7a7d7a 100644 --- a/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD +++ b/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD @@ -1,7 +1,6 @@ -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 +0000000000000000000000000000000000000000 1ea8d05b2cbc972b48eae3181e846f82eeab50ef CI 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 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 62c5e5c79..f257dee84 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 c00c9eb1ae239494475772c3f3dbae5ea4169575 CI 1643011799 +1100 commit (initial): file0 -c00c9eb1ae239494475772c3f3dbae5ea4169575 7605fecac5dee01fb9df55ca984dcc7a72810f48 CI 1643011799 +1100 commit: file1 -7605fecac5dee01fb9df55ca984dcc7a72810f48 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011799 +1100 commit: file2 +0000000000000000000000000000000000000000 1ea8d05b2cbc972b48eae3181e846f82eeab50ef CI 1650002477 +0200 commit (initial): file0 +1ea8d05b2cbc972b48eae3181e846f82eeab50ef 8e724d42465144007f28d45514537886f527eef9 CI 1650002477 +0200 commit: file1 +8e724d42465144007f28d45514537886f527eef9 f1963e622e30276cf4e5880109ea475434d6f2ae CI 1650002477 +0200 commit: file2 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index 0b47b5c2e..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f4f81b6542e98a2f80269449674b0f8f454b74b0 CI 1643011806 +1100 On master: dsa diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 b/test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 new file mode 100644 index 000000000..858c3f4b3 --- /dev/null +++ b/test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 @@ -0,0 +1,4 @@ +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/1c/88e069f3e318f1e0e02188cf65d360ab4eab67 b/test/integration/stashDrop/expected/repo/.git_keep/objects/1c/88e069f3e318f1e0e02188cf65d360ab4eab67 new file mode 100644 index 000000000..3443df098 Binary files /dev/null and b/test/integration/stashDrop/expected/repo/.git_keep/objects/1c/88e069f3e318f1e0e02188cf65d360ab4eab67 differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b b/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b deleted file mode 100644 index 24145cefe..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/a8d05b2cbc972b48eae3181e846f82eeab50ef b/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/a8d05b2cbc972b48eae3181e846f82eeab50ef new file mode 100644 index 000000000..8e5c770ef Binary files /dev/null and b/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/a8d05b2cbc972b48eae3181e846f82eeab50ef differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf b/test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf new file mode 100644 index 000000000..f79c6d13b --- /dev/null +++ b/test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf @@ -0,0 +1 @@ +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/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stashDrop/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 deleted file mode 100644 index 8535af67c..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 b/test/integration/stashDrop/expected/repo/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 deleted file mode 100644 index 6d84f0e3f..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 b/test/integration/stashDrop/expected/repo/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 deleted file mode 100644 index 782d5f0ee..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/87/82cd42420de6a24264417d43d50ada9aa53ad5 b/test/integration/stashDrop/expected/repo/.git_keep/objects/87/82cd42420de6a24264417d43d50ada9aa53ad5 new file mode 100644 index 000000000..e4dd3c06e Binary files /dev/null and b/test/integration/stashDrop/expected/repo/.git_keep/objects/87/82cd42420de6a24264417d43d50ada9aa53ad5 differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/724d42465144007f28d45514537886f527eef9 b/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/724d42465144007f28d45514537886f527eef9 new file mode 100644 index 000000000..4fb5b0def Binary files /dev/null and b/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/724d42465144007f28d45514537886f527eef9 differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 new file mode 100644 index 000000000..2a1928079 Binary files /dev/null and b/test/integration/stashDrop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stashDrop/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c deleted file mode 100644 index 539f97919..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/a2/11ee6ddb1146ba9680c58c08e40fa0162bd98d b/test/integration/stashDrop/expected/repo/.git_keep/objects/a2/11ee6ddb1146ba9680c58c08e40fa0162bd98d new file mode 100644 index 000000000..0179f5cc4 Binary files /dev/null and b/test/integration/stashDrop/expected/repo/.git_keep/objects/a2/11ee6ddb1146ba9680c58c08e40fa0162bd98d differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac b/test/integration/stashDrop/expected/repo/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac deleted file mode 100644 index 20498e40d..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 b/test/integration/stashDrop/expected/repo/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 deleted file mode 100644 index 3a5979b5c..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 +++ /dev/null @@ -1,2 +0,0 @@ -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/stashDrop/expected/repo/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 b/test/integration/stashDrop/expected/repo/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 deleted file mode 100644 index ce64e7f52..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 +++ /dev/null @@ -1,3 +0,0 @@ -x1 -0 @>B8BC%\#tV<})gEpg=ɝ-0V: \ No newline at end of file diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b b/test/integration/stashDrop/expected/repo/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b deleted file mode 100644 index 57420d027..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 b/test/integration/stashDrop/expected/repo/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 deleted file mode 100644 index 965e28b60..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/f1/963e622e30276cf4e5880109ea475434d6f2ae b/test/integration/stashDrop/expected/repo/.git_keep/objects/f1/963e622e30276cf4e5880109ea475434d6f2ae new file mode 100644 index 000000000..3fd7331e6 Binary files /dev/null and b/test/integration/stashDrop/expected/repo/.git_keep/objects/f1/963e622e30276cf4e5880109ea475434d6f2ae differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 b/test/integration/stashDrop/expected/repo/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 deleted file mode 100644 index 0c09e49d2..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master b/test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master index 0a7c9cc2b..7bd761f02 100644 --- a/test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master +++ b/test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master @@ -1 +1 @@ -d22496528fe3c076a668c496ae7ba1f8136f1614 +f1963e622e30276cf4e5880109ea475434d6f2ae diff --git a/test/integration/stashDrop/expected/repo/.git_keep/refs/stash b/test/integration/stashDrop/expected/repo/.git_keep/refs/stash deleted file mode 100644 index 0a4ae7ab5..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -f4f81b6542e98a2f80269449674b0f8f454b74b0 diff --git a/test/integration/stashDrop/expected/repo/file1 b/test/integration/stashDrop/expected/repo/file1 index a5bce3fd2..c7c7da3c6 100644 --- a/test/integration/stashDrop/expected/repo/file1 +++ b/test/integration/stashDrop/expected/repo/file1 @@ -1 +1 @@ -test1 +hello there diff --git a/test/integration/stashDrop/expected/repo/file2 b/test/integration/stashDrop/expected/repo/file2 index c7c7da3c6..180cf8328 100644 --- a/test/integration/stashDrop/expected/repo/file2 +++ b/test/integration/stashDrop/expected/repo/file2 @@ -1 +1 @@ -hello there +test2 diff --git a/test/integration/stashDrop/expected/repo/file3 b/test/integration/stashDrop/expected/repo/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashDrop/expected/repo/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashDrop/recording.json b/test/integration/stashDrop/recording.json index c61c97b24..fb15d10b1 100644 --- a/test/integration/stashDrop/recording.json +++ b/test/integration/stashDrop/recording.json @@ -1 +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 +{"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}]} \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD index 8e8f6abd0..32bd1b5cc 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -8634432ef171aa4b8d8e688fc1e5645245bf36ac +605615b78c181314a7a019e116647bfdf9127c94 diff --git a/test/integration/stashPop/expected/repo/.git_keep/config b/test/integration/stashPop/expected/repo/.git_keep/config index 8ae104545..596ebaeb3 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/config +++ b/test/integration/stashPop/expected/repo/.git_keep/config @@ -3,8 +3,6 @@ filemode = true bare = false logallrefupdates = true - ignorecase = true - precomposeunicode = true [user] email = CI@example.com name = CI diff --git a/test/integration/stashPop/expected/repo/.git_keep/index b/test/integration/stashPop/expected/repo/.git_keep/index index 1c25c6cf6..0850077fd 100644 Binary files a/test/integration/stashPop/expected/repo/.git_keep/index and b/test/integration/stashPop/expected/repo/.git_keep/index differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/info/exclude b/test/integration/stashPop/expected/repo/.git_keep/info/exclude index 8e9f2071f..a5196d1be 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/info/exclude +++ b/test/integration/stashPop/expected/repo/.git_keep/info/exclude @@ -4,4 +4,3 @@ # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~ -.DS_Store diff --git a/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD b/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD index 36f584bdf..6740e556b 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD +++ b/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD @@ -1,7 +1,5 @@ -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 +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 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 5493552ad..f83a90cae 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 8b081dcb0e1fd5e9862d1aa6891b805b101abe7b CI 1643011851 +1100 commit (initial): file0 -8b081dcb0e1fd5e9862d1aa6891b805b101abe7b 3ae4e5d4920afbb1bac23426afb237524c8dbe41 CI 1643011851 +1100 commit: file1 -3ae4e5d4920afbb1bac23426afb237524c8dbe41 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011852 +1100 commit: file2 +0000000000000000000000000000000000000000 2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 CI 1650186466 +0200 commit (initial): file0 +2ec2033bcc750a5c30ad6f00e6caa7b5848f26f0 0138b2ed57b0412b2c2244a267fc1396f06ac287 CI 1650186466 +0200 commit: file1 +0138b2ed57b0412b2c2244a267fc1396f06ac287 605615b78c181314a7a019e116647bfdf9127c94 CI 1650186466 +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 index 4a66ec164..ca9920f6e 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash +++ b/test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash @@ -1 +1 @@ -0000000000000000000000000000000000000000 437b9b0ca941f1e12c8b45958f5d6ebd11cdd41a CI 1643011856 +1100 On master: asd +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 new file mode 100644 index 000000000..d4936dcdf --- /dev/null +++ b/test/integration/stashPop/expected/repo/.git_keep/objects/01/38b2ed57b0412b2c2244a267fc1396f06ac287 @@ -0,0 +1,2 @@ +xK +0@] 2M1 SJogOswTDɍkX[nfPID)znjfTj,đ$V|&MdAՆyr lܿn-PDe 'D=~cJ) \ 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 new file mode 100644 index 000000000..a8d3c8495 --- /dev/null +++ b/test/integration/stashPop/expected/repo/.git_keep/objects/5e/6c498354e93f4049e80254810f4577b180a8ab @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..22dbe19c0 Binary files /dev/null and b/test/integration/stashPop/expected/repo/.git_keep/objects/60/5615b78c181314a7a019e116647bfdf9127c94 differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 b/test/integration/stashPop/expected/repo/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 deleted file mode 100644 index 1794b8694..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac b/test/integration/stashPop/expected/repo/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac deleted file mode 100644 index 24d309c9e..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/8b/0567b6e2fd39edce87bc7ed6e7ba7868e55930 b/test/integration/stashPop/expected/repo/.git_keep/objects/8b/0567b6e2fd39edce87bc7ed6e7ba7868e55930 new file mode 100644 index 000000000..5634f8031 Binary files /dev/null and b/test/integration/stashPop/expected/repo/.git_keep/objects/8b/0567b6e2fd39edce87bc7ed6e7ba7868e55930 differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b b/test/integration/stashPop/expected/repo/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b deleted file mode 100644 index e730193f1..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 b/test/integration/stashPop/expected/repo/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 deleted file mode 100644 index 4541e3cc9..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/a8/4a187f63b05bb43f19cfbc8bedab97ed33272d b/test/integration/stashPop/expected/repo/.git_keep/objects/a8/4a187f63b05bb43f19cfbc8bedab97ed33272d new file mode 100644 index 000000000..351b71e04 Binary files /dev/null and b/test/integration/stashPop/expected/repo/.git_keep/objects/a8/4a187f63b05bb43f19cfbc8bedab97ed33272d differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e b/test/integration/stashPop/expected/repo/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e deleted file mode 100644 index 8ebf85670..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 b/test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 new file mode 100644 index 000000000..2a71485a3 --- /dev/null +++ b/test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 @@ -0,0 +1,3 @@ +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/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 b/test/integration/stashPop/expected/repo/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 deleted file mode 100644 index 6f47ae7a5..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 +++ /dev/null @@ -1 +0,0 @@ -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/repo/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c b/test/integration/stashPop/expected/repo/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c deleted file mode 100644 index 026ea2da1..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c and /dev/null differ 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 8e8f6abd0..32bd1b5cc 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 @@ -8634432ef171aa4b8d8e688fc1e5645245bf36ac +605615b78c181314a7a019e116647bfdf9127c94 diff --git a/test/integration/stashPop/expected/repo/.git_keep/refs/stash b/test/integration/stashPop/expected/repo/.git_keep/refs/stash index 86ea2c9b3..3a695ec9e 100644 --- a/test/integration/stashPop/expected/repo/.git_keep/refs/stash +++ b/test/integration/stashPop/expected/repo/.git_keep/refs/stash @@ -1 +1 @@ -437b9b0ca941f1e12c8b45958f5d6ebd11cdd41a +5e6c498354e93f4049e80254810f4577b180a8ab diff --git a/test/integration/stashPop/expected/repo/file2 b/test/integration/stashPop/expected/repo/file2 index 180cf8328..c7c7da3c6 100644 --- a/test/integration/stashPop/expected/repo/file2 +++ b/test/integration/stashPop/expected/repo/file2 @@ -1 +1 @@ -test2 +hello there diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashStagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..a47ee9407 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +2b515d20a02212d14a519d82917b791e01ebc659 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/config b/test/integration/stashStagedChanges/expected/repo/.git_keep/config new file mode 100644 index 000000000..596ebaeb3 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/description b/test/integration/stashStagedChanges/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/index b/test/integration/stashStagedChanges/expected/repo/.git_keep/index new file mode 100644 index 000000000..b5bae0d08 Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/index differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/info/exclude b/test/integration/stashStagedChanges/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/info/exclude @@ -0,0 +1,6 @@ +# 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] +# *~ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..a5965cba2 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 4062b34fff18c4453edded2da4f0737176daaa4d CI 1650002424 +0200 commit (initial): file0 +4062b34fff18c4453edded2da4f0737176daaa4d b160a56c2580f8cc1e5432f32212f83395459997 CI 1650002424 +0200 commit: file1 +b160a56c2580f8cc1e5432f32212f83395459997 2b515d20a02212d14a519d82917b791e01ebc659 CI 1650002424 +0200 commit: file2 +2b515d20a02212d14a519d82917b791e01ebc659 2b515d20a02212d14a519d82917b791e01ebc659 CI 1650002430 +0200 reset: moving to HEAD +2b515d20a02212d14a519d82917b791e01ebc659 2b515d20a02212d14a519d82917b791e01ebc659 CI 1650002430 +0200 reset: moving to HEAD diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..8e5dd5d7f --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 4062b34fff18c4453edded2da4f0737176daaa4d CI 1650002424 +0200 commit (initial): file0 +4062b34fff18c4453edded2da4f0737176daaa4d b160a56c2580f8cc1e5432f32212f83395459997 CI 1650002424 +0200 commit: file1 +b160a56c2580f8cc1e5432f32212f83395459997 2b515d20a02212d14a519d82917b791e01ebc659 CI 1650002424 +0200 commit: file2 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da new file mode 100644 index 000000000..ea6cd3866 Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/515d20a02212d14a519d82917b791e01ebc659 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/515d20a02212d14a519d82917b791e01ebc659 new file mode 100644 index 000000000..0f1ad7e2f Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/515d20a02212d14a519d82917b791e01ebc659 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/d62bafdea9ceb4732326e82d4ce14196d7a032 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/d62bafdea9ceb4732326e82d4ce14196d7a032 new file mode 100644 index 000000000..1b07a5cbc Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/d62bafdea9ceb4732326e82d4ce14196d7a032 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/40/62b34fff18c4453edded2da4f0737176daaa4d b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/40/62b34fff18c4453edded2da4f0737176daaa4d new file mode 100644 index 000000000..2fe4f5acd Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/40/62b34fff18c4453edded2da4f0737176daaa4d differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 new file mode 100644 index 000000000..6dc24b6d3 Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/54/fbb8276359cb6f68faa9cb7dcf58f93c838035 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/54/fbb8276359cb6f68faa9cb7dcf58f93c838035 new file mode 100644 index 000000000..77c7961f7 Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/54/fbb8276359cb6f68faa9cb7dcf58f93c838035 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/b1/60a56c2580f8cc1e5432f32212f83395459997 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/b1/60a56c2580f8cc1e5432f32212f83395459997 new file mode 100644 index 000000000..333da1d7e Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/b1/60a56c2580f8cc1e5432f32212f83395459997 differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 000000000..ee4385f12 Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.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/stashStagedChanges/expected/repo/.git_keep/objects/fe/0b6136ae74e574b3349fabbf0b89053c6a201e b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/fe/0b6136ae74e574b3349fabbf0b89053c6a201e new file mode 100644 index 000000000..6524d6dfd Binary files /dev/null and b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/fe/0b6136ae74e574b3349fabbf0b89053c6a201e differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..a47ee9407 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +2b515d20a02212d14a519d82917b791e01ebc659 diff --git a/test/integration/stashStagedChanges/expected/repo/file0 b/test/integration/stashStagedChanges/expected/repo/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stashStagedChanges/expected/repo/file1 b/test/integration/stashStagedChanges/expected/repo/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashStagedChanges/expected/repo/file2 b/test/integration/stashStagedChanges/expected/repo/file2 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/file2 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashStagedChanges/expected/repo/file3 b/test/integration/stashStagedChanges/expected/repo/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashStagedChanges/expected/repo/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashStagedChanges/recording.json b/test/integration/stashStagedChanges/recording.json new file mode 100644 index 000000000..6668ebd74 --- /dev/null +++ b/test/integration/stashStagedChanges/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1280,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2255,"Mod":0,"Key":256,"Ch":106},{"Timestamp":2343,"Mod":0,"Key":256,"Ch":106},{"Timestamp":2674,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3166,"Mod":0,"Key":256,"Ch":83},{"Timestamp":4209,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4609,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4677,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4764,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4831,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4956,"Mod":0,"Key":256,"Ch":104},{"Timestamp":5090,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5382,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5442,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5529,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5632,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5696,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5836,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6323,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7236,"Mod":0,"Key":256,"Ch":53},{"Timestamp":8544,"Mod":0,"Key":256,"Ch":103},{"Timestamp":9140,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10071,"Mod":0,"Key":256,"Ch":50},{"Timestamp":10936,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} \ No newline at end of file diff --git a/test/integration/stashStagedChanges/setup.sh b/test/integration/stashStagedChanges/setup.sh new file mode 100644 index 000000000..caff56b7d --- /dev/null +++ b/test/integration/stashStagedChanges/setup.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +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/stashStagedChanges/test.json b/test/integration/stashStagedChanges/test.json new file mode 100644 index 000000000..4f9314caa --- /dev/null +++ b/test/integration/stashStagedChanges/test.json @@ -0,0 +1 @@ +{ "description": "Stashing some files", "speed": 5 } diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..a7a2e0039 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +[lazygit] stashing unstaged changes diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..a25f0f809 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ed408704bb5eb653ceacee9ce485ef1bb0ea7a0b diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/config b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/config new file mode 100644 index 000000000..596ebaeb3 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/description b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/index b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/index new file mode 100644 index 000000000..6d965fc2e Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/index differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/info/exclude b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/info/exclude @@ -0,0 +1,6 @@ +# 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] +# *~ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..c1a19352a --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 84988130b443577e2afc62d4103f92fcbed33add CI 1650002439 +0200 commit (initial): file0 +84988130b443577e2afc62d4103f92fcbed33add c884f894908d3042f54995005b8e3445958b2fcc CI 1650002439 +0200 commit: file1 +c884f894908d3042f54995005b8e3445958b2fcc 74244487ab29dc413ae1f98e4fa40256a0787212 CI 1650002439 +0200 commit: file2 +74244487ab29dc413ae1f98e4fa40256a0787212 ed408704bb5eb653ceacee9ce485ef1bb0ea7a0b CI 1650002447 +0200 commit: [lazygit] stashing unstaged changes +ed408704bb5eb653ceacee9ce485ef1bb0ea7a0b ed408704bb5eb653ceacee9ce485ef1bb0ea7a0b CI 1650002447 +0200 reset: moving to HEAD +ed408704bb5eb653ceacee9ce485ef1bb0ea7a0b 74244487ab29dc413ae1f98e4fa40256a0787212 CI 1650002447 +0200 reset: moving to HEAD^ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..02ecdf692 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 84988130b443577e2afc62d4103f92fcbed33add CI 1650002439 +0200 commit (initial): file0 +84988130b443577e2afc62d4103f92fcbed33add c884f894908d3042f54995005b8e3445958b2fcc CI 1650002439 +0200 commit: file1 +c884f894908d3042f54995005b8e3445958b2fcc 74244487ab29dc413ae1f98e4fa40256a0787212 CI 1650002439 +0200 commit: file2 +74244487ab29dc413ae1f98e4fa40256a0787212 ed408704bb5eb653ceacee9ce485ef1bb0ea7a0b CI 1650002447 +0200 commit: [lazygit] stashing unstaged changes +ed408704bb5eb653ceacee9ce485ef1bb0ea7a0b 74244487ab29dc413ae1f98e4fa40256a0787212 CI 1650002447 +0200 reset: moving to HEAD^ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/3a/8dac53bf53e3243a325a9e0b3ef523764ee74d b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/3a/8dac53bf53e3243a325a9e0b3ef523764ee74d new file mode 100644 index 000000000..205ac4dc4 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/3a/8dac53bf53e3243a325a9e0b3ef523764ee74d @@ -0,0 +1,2 @@ +xj0DsW=P6ZK) ]ie"9 +${nxayБU 9Eo]HñCIȓOO͍W-4zmUl AuJtAe(uZV8tU?’`{DC4mRU\>`)ykϗ\ [me#N \ No newline at end of file diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 000000000..6a6f24362 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.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/stashUnstagedChanges/expected/repo/.git_keep/objects/74/244487ab29dc413ae1f98e4fa40256a0787212 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/74/244487ab29dc413ae1f98e4fa40256a0787212 new file mode 100644 index 000000000..3a76ae79e Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/74/244487ab29dc413ae1f98e4fa40256a0787212 differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/84/988130b443577e2afc62d4103f92fcbed33add b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/84/988130b443577e2afc62d4103f92fcbed33add new file mode 100644 index 000000000..2e8429425 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/84/988130b443577e2afc62d4103f92fcbed33add differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c2/71c5cc28c056383278c655b4e227fa69b06073 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c2/71c5cc28c056383278c655b4e227fa69b06073 new file mode 100644 index 000000000..9eb554914 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c2/71c5cc28c056383278c655b4e227fa69b06073 differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 000000000..ee4385f12 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c8/84f894908d3042f54995005b8e3445958b2fcc b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c8/84f894908d3042f54995005b8e3445958b2fcc new file mode 100644 index 000000000..92422c064 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c8/84f894908d3042f54995005b8e3445958b2fcc differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.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/stashUnstagedChanges/expected/repo/.git_keep/objects/ed/408704bb5eb653ceacee9ce485ef1bb0ea7a0b b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/ed/408704bb5eb653ceacee9ce485ef1bb0ea7a0b new file mode 100644 index 000000000..b7c7df645 Binary files /dev/null and b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/ed/408704bb5eb653ceacee9ce485ef1bb0ea7a0b differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..5df16c6e7 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +74244487ab29dc413ae1f98e4fa40256a0787212 diff --git a/test/integration/stashUnstagedChanges/expected/repo/file0 b/test/integration/stashUnstagedChanges/expected/repo/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/stashUnstagedChanges/expected/repo/file1 b/test/integration/stashUnstagedChanges/expected/repo/file1 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/file1 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashUnstagedChanges/expected/repo/file2 b/test/integration/stashUnstagedChanges/expected/repo/file2 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/file2 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashUnstagedChanges/expected/repo/file3 b/test/integration/stashUnstagedChanges/expected/repo/file3 new file mode 100644 index 000000000..c7c7da3c6 --- /dev/null +++ b/test/integration/stashUnstagedChanges/expected/repo/file3 @@ -0,0 +1 @@ +hello there diff --git a/test/integration/stashUnstagedChanges/recording.json b/test/integration/stashUnstagedChanges/recording.json new file mode 100644 index 000000000..704084fbb --- /dev/null +++ b/test/integration/stashUnstagedChanges/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1319,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2975,"Mod":0,"Key":256,"Ch":83},{"Timestamp":5557,"Mod":0,"Key":256,"Ch":117},{"Timestamp":7054,"Mod":0,"Key":256,"Ch":117},{"Timestamp":7219,"Mod":0,"Key":256,"Ch":110},{"Timestamp":7262,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7319,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7404,"Mod":0,"Key":256,"Ch":97},{"Timestamp":7492,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7534,"Mod":0,"Key":256,"Ch":101},{"Timestamp":7679,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7965,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9053,"Mod":0,"Key":256,"Ch":53},{"Timestamp":10348,"Mod":0,"Key":256,"Ch":103},{"Timestamp":10979,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12354,"Mod":0,"Key":256,"Ch":50},{"Timestamp":12874,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} \ No newline at end of file diff --git a/test/integration/stashUnstagedChanges/setup.sh b/test/integration/stashUnstagedChanges/setup.sh new file mode 100644 index 000000000..caff56b7d --- /dev/null +++ b/test/integration/stashUnstagedChanges/setup.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +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/stashUnstagedChanges/test.json b/test/integration/stashUnstagedChanges/test.json new file mode 100644 index 000000000..4f9314caa --- /dev/null +++ b/test/integration/stashUnstagedChanges/test.json @@ -0,0 +1 @@ +{ "description": "Stashing some files", "speed": 5 }