From bd9daf80b78789f28b151164b4baa45db3eb4898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= Date: Fri, 15 Apr 2022 08:03:25 +0200 Subject: [PATCH] Add integration tests --- pkg/commands/git_commands/stash.go | 2 +- .../stash/expected/repo/.git_keep/ORIG_HEAD | 2 +- .../stash/expected/repo/.git_keep/config | 2 -- .../stash/expected/repo/.git_keep/index | Bin 281 -> 262 bytes .../expected/repo/.git_keep/info/exclude | 1 - .../stash/expected/repo/.git_keep/logs/HEAD | 11 ++++---- .../repo/.git_keep/logs/refs/heads/master | 6 ++-- .../expected/repo/.git_keep/logs/refs/stash | 3 +- .../25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc | Bin 161 -> 0 bytes .../2e/fac8148440778cbddcd80ac7477981277dcffe | 1 - .../3b/29b35d4357f8e64cafd95140a70d7c9b25138a | Bin 162 -> 0 bytes .../4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d | Bin 147 -> 0 bytes .../4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 | 2 ++ .../6b/1f87e5b74cd77d755d213e0850f4de02b3cdce | Bin 0 -> 148 bytes .../81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 | 2 ++ .../8c/3123f6f4cee663b57398072df088c6f2dfeb9b | 3 ++ .../8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 | Bin .../9f/2757166809c291c65f09778abb46cfcc4e4a0c | Bin 107 -> 0 bytes .../a6/ada9f3d895e751ec289c69913a02146c0ca844 | Bin 191 -> 0 bytes .../a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b | Bin 118 -> 0 bytes .../be/485112173592dea7b39c7efc3a6f52f43b71b9 | Bin 0 -> 184 bytes .../be/be684962b7b3a4d751f95173b31a051c7d46e7 | Bin 0 -> 182 bytes .../e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 | Bin 184 -> 0 bytes .../f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 | Bin 147 -> 0 bytes .../f7/114350b59290905115d7918efe144eb2c62a76 | Bin 0 -> 147 bytes .../expected/repo/.git_keep/refs/heads/master | 2 +- .../stash/expected/repo/.git_keep/refs/stash | 2 +- test/integration/stash/expected/repo/file2 | 2 +- test/integration/stash/expected/repo/file3 | 1 + test/integration/stash/recording.json | 2 +- .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 + .../expected/repo/.git_keep/ORIG_HEAD | 1 + .../expected/repo/.git_keep/config | 8 ++++++ .../expected/repo/.git_keep/description | 1 + .../expected/repo/.git_keep/index | Bin 0 -> 262 bytes .../expected/repo/.git_keep/info/exclude | 6 ++++ .../expected/repo/.git_keep/logs/HEAD | 6 ++++ .../repo/.git_keep/logs/refs/heads/master | 3 ++ .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../28/59c9a5f343c80929844d6e49d3792b9169c4da | Bin 0 -> 85 bytes .../29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 | 3 ++ .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../56/52247b638d1516506790d6648b864ba3447f68 | Bin .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 0 -> 81 bytes .../62/4317ac2731648d4b0e30068dd35aca2a0b4791 | Bin 0 -> 147 bytes .../6c/09c8b498849a1679bcd05488661a2ce123b578 | 2 ++ .../6e/fac41f92e54de5411b9195449dbef0960daaf4 | 3 ++ .../7f/e42e1229b06d1307f6e7717c47f6bb4248fa2e | 1 + .../8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 | Bin 0 -> 100 bytes .../8f/a874178500f99d69f649ff9128f3d1b62369a0 | Bin 0 -> 148 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../b1/dfa9f82f0821f9decd33c52c9bfe0f0ff86b41 | Bin 0 -> 162 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../d7/cc3e41ea34ee3f9441b3a1493405d34f15c1cd | 1 + .../f9/0ee43c5ddc18a1341e5d77f2319e4e00e5effc | Bin 0 -> 161 bytes .../expected/repo/.git_keep/refs/heads/master | 1 + .../stashAllChanges/expected/repo/file0 | 1 + .../stashAllChanges/expected/repo/file1 | 1 + .../stashAllChanges/expected/repo/file2 | 1 + .../stashAllChanges/expected/repo/file3 | 1 + .../stashAllChanges/recording.json | 1 + test/integration/stashAllChanges/setup.sh | 26 ++++++++++++++++++ test/integration/stashAllChanges/test.json | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 + .../expected/repo/.git_keep/ORIG_HEAD | 1 + .../expected/repo/.git_keep/config | 8 ++++++ .../expected/repo/.git_keep/description | 1 + .../expected/repo/.git_keep/index | Bin 0 -> 262 bytes .../expected/repo/.git_keep/info/exclude | 6 ++++ .../expected/repo/.git_keep/logs/HEAD | 4 +++ .../repo/.git_keep/logs/refs/heads/master | 3 ++ .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../24/35f1f9565ecb370eb550f591d55179f1e9a7de | Bin 0 -> 161 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 0 -> 81 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 ++ .../78/3b58a50bb867917c6a8a78ff18cadb3fdc771e | Bin 0 -> 119 bytes .../8f/bffdd316c764e171c3e421205327588077f49c | 1 + .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../e2/21db5981b482fb2110c8b283f48c08cd5f10c3 | Bin 0 -> 148 bytes .../e5/5d4f76f2b99c3b6b0c960725099ae54e34af70 | Bin 0 -> 147 bytes .../expected/repo/.git_keep/refs/heads/master | 1 + .../expected/repo/file0 | 1 + .../expected/repo/file1 | 1 + .../expected/repo/file2 | 1 + .../expected/repo/file3 | 1 + .../stashAllChangesKeepIndex/recording.json | 1 + .../stashAllChangesKeepIndex/setup.sh | 26 ++++++++++++++++++ .../stashAllChangesKeepIndex/test.json | 1 + .../expected/repo/.git_keep/ORIG_HEAD | 2 +- .../stashDrop/expected/repo/.git_keep/config | 2 -- .../stashDrop/expected/repo/.git_keep/index | Bin 262 -> 262 bytes .../expected/repo/.git_keep/info/exclude | 1 - .../expected/repo/.git_keep/logs/HEAD | 13 ++++----- .../repo/.git_keep/logs/refs/heads/master | 6 ++-- .../expected/repo/.git_keep/logs/refs/stash | 1 - .../0d/b7c2bffa900585f06112e5b06f8f358638f447 | 4 +++ .../1c/88e069f3e318f1e0e02188cf65d360ab4eab67 | Bin 0 -> 185 bytes .../1e/6f4a55f3dd26848238337763f249681ef9397b | Bin 160 -> 0 bytes .../1e/a8d05b2cbc972b48eae3181e846f82eeab50ef | Bin 0 -> 118 bytes .../2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf | 1 + .../56/52247b638d1516506790d6648b864ba3447f68 | Bin 127 -> 0 bytes .../6d/c07da80aed51d01a56a89ef37f4411adbd75c5 | Bin 161 -> 0 bytes .../76/05fecac5dee01fb9df55ca984dcc7a72810f48 | Bin 145 -> 0 bytes .../87/82cd42420de6a24264417d43d50ada9aa53ad5 | Bin 0 -> 162 bytes .../8e/724d42465144007f28d45514537886f527eef9 | Bin 0 -> 146 bytes .../8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 | Bin 0 -> 100 bytes .../9f/2757166809c291c65f09778abb46cfcc4e4a0c | Bin 107 -> 0 bytes .../a2/11ee6ddb1146ba9680c58c08e40fa0162bd98d | Bin 0 -> 182 bytes .../a6/ed180e13649885eed39866051ca0e25c0ad6ac | Bin 189 -> 0 bytes .../c0/0c9eb1ae239494475772c3f3dbae5ea4169575 | 2 -- .../d2/2496528fe3c076a668c496ae7ba1f8136f1614 | 3 -- .../e0/61c8716830532562f919dcb125ea804f87ca2b | Bin 182 -> 0 bytes .../e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 | Bin 190 -> 0 bytes .../f1/963e622e30276cf4e5880109ea475434d6f2ae | Bin 0 -> 146 bytes .../f4/f81b6542e98a2f80269449674b0f8f454b74b0 | Bin 182 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 2 +- .../expected/repo/.git_keep/refs/stash | 1 - .../integration/stashDrop/expected/repo/file1 | 2 +- .../integration/stashDrop/expected/repo/file2 | 2 +- .../integration/stashDrop/expected/repo/file3 | 1 + test/integration/stashDrop/recording.json | 2 +- .../expected/repo/.git_keep/ORIG_HEAD | 2 +- .../stashPop/expected/repo/.git_keep/config | 2 -- .../stashPop/expected/repo/.git_keep/index | Bin 281 -> 262 bytes .../expected/repo/.git_keep/info/exclude | 1 - .../expected/repo/.git_keep/logs/HEAD | 12 ++++---- .../repo/.git_keep/logs/refs/heads/master | 6 ++-- .../expected/repo/.git_keep/logs/refs/stash | 2 +- .../01/38b2ed57b0412b2c2244a267fc1396f06ac287 | 2 ++ .../2e/c2033bcc750a5c30ad6f00e6caa7b5848f26f0 | Bin 0 -> 118 bytes .../3a/e4e5d4920afbb1bac23426afb237524c8dbe41 | Bin 147 -> 0 bytes .../43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a | 1 - .../5e/6c498354e93f4049e80254810f4577b180a8ab | 2 ++ .../60/5615b78c181314a7a019e116647bfdf9127c94 | Bin 0 -> 147 bytes .../82/cc524693ae9fb40af0ed8ab7e22581084dcd17 | Bin 161 -> 0 bytes .../86/34432ef171aa4b8d8e688fc1e5645245bf36ac | Bin 147 -> 0 bytes .../8b/0567b6e2fd39edce87bc7ed6e7ba7868e55930 | Bin 0 -> 183 bytes .../8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b | Bin 118 -> 0 bytes .../8b/d86c566a91e9f8ace9883f7017f562c971b3f7 | Bin 182 -> 0 bytes .../a8/4a187f63b05bb43f19cfbc8bedab97ed33272d | Bin 0 -> 162 bytes .../b0/00623a052b4d2226c43ba396b830738799740e | Bin 162 -> 0 bytes .../b8/372ee9ddb68d8b15c440d86d21b6199583fb26 | 3 ++ .../c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 | 1 - .../e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c | Bin 190 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 2 +- .../expected/repo/.git_keep/refs/stash | 2 +- test/integration/stashPop/expected/repo/file2 | 2 +- .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 + .../expected/repo/.git_keep/ORIG_HEAD | 1 + .../expected/repo/.git_keep/config | 8 ++++++ .../expected/repo/.git_keep/description | 1 + .../expected/repo/.git_keep/index | Bin 0 -> 334 bytes .../expected/repo/.git_keep/info/exclude | 6 ++++ .../expected/repo/.git_keep/logs/HEAD | 5 ++++ .../repo/.git_keep/logs/refs/heads/master | 3 ++ .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../28/59c9a5f343c80929844d6e49d3792b9169c4da | Bin 0 -> 85 bytes .../2b/515d20a02212d14a519d82917b791e01ebc659 | Bin 0 -> 148 bytes .../2b/d62bafdea9ceb4732326e82d4ce14196d7a032 | Bin 0 -> 160 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../40/62b34fff18c4453edded2da4f0737176daaa4d | Bin 0 -> 118 bytes .../4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 | Bin 0 -> 107 bytes .../54/fbb8276359cb6f68faa9cb7dcf58f93c838035 | Bin 0 -> 187 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../b1/60a56c2580f8cc1e5432f32212f83395459997 | Bin 0 -> 147 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../fe/0b6136ae74e574b3349fabbf0b89053c6a201e | Bin 0 -> 187 bytes .../expected/repo/.git_keep/refs/heads/master | 1 + .../stashStagedChanges/expected/repo/file0 | 1 + .../stashStagedChanges/expected/repo/file1 | 1 + .../stashStagedChanges/expected/repo/file2 | 1 + .../stashStagedChanges/expected/repo/file3 | 1 + .../stashStagedChanges/recording.json | 1 + test/integration/stashStagedChanges/setup.sh | 26 ++++++++++++++++++ test/integration/stashStagedChanges/test.json | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 + .../expected/repo/.git_keep/ORIG_HEAD | 1 + .../expected/repo/.git_keep/config | 8 ++++++ .../expected/repo/.git_keep/description | 1 + .../expected/repo/.git_keep/index | Bin 0 -> 262 bytes .../expected/repo/.git_keep/info/exclude | 6 ++++ .../expected/repo/.git_keep/logs/HEAD | 6 ++++ .../repo/.git_keep/logs/refs/heads/master | 5 ++++ .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3a/8dac53bf53e3243a325a9e0b3ef523764ee74d | 2 ++ .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 0 -> 81 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 ++ .../74/244487ab29dc413ae1f98e4fa40256a0787212 | Bin 0 -> 147 bytes .../84/988130b443577e2afc62d4103f92fcbed33add | Bin 0 -> 118 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../c2/71c5cc28c056383278c655b4e227fa69b06073 | Bin 0 -> 185 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../c8/84f894908d3042f54995005b8e3445958b2fcc | Bin 0 -> 148 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../ed/408704bb5eb653ceacee9ce485ef1bb0ea7a0b | Bin 0 -> 176 bytes .../expected/repo/.git_keep/refs/heads/master | 1 + .../stashUnstagedChanges/expected/repo/file0 | 1 + .../stashUnstagedChanges/expected/repo/file1 | 1 + .../stashUnstagedChanges/expected/repo/file2 | 1 + .../stashUnstagedChanges/expected/repo/file3 | 1 + .../stashUnstagedChanges/recording.json | 1 + .../integration/stashUnstagedChanges/setup.sh | 26 ++++++++++++++++++ .../stashUnstagedChanges/test.json | 1 + 225 files changed, 329 insertions(+), 66 deletions(-) delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d create mode 100644 test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 create mode 100644 test/integration/stash/expected/repo/.git_keep/objects/6b/1f87e5b74cd77d755d213e0850f4de02b3cdce create mode 100644 test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 create mode 100644 test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b rename test/integration/{stashPop => stash}/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 (100%) delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b create mode 100644 test/integration/stash/expected/repo/.git_keep/objects/be/485112173592dea7b39c7efc3a6f52f43b71b9 create mode 100644 test/integration/stash/expected/repo/.git_keep/objects/be/be684962b7b3a4d751f95173b31a051c7d46e7 delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 delete mode 100644 test/integration/stash/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 create mode 100644 test/integration/stash/expected/repo/.git_keep/objects/f7/114350b59290905115d7918efe144eb2c62a76 create mode 100644 test/integration/stash/expected/repo/file3 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/FETCH_HEAD create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/HEAD create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/config create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/description create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/index create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename test/integration/{stash => stashAllChanges}/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 (100%) create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/62/4317ac2731648d4b0e30068dd35aca2a0b4791 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/6c/09c8b498849a1679bcd05488661a2ce123b578 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/6e/fac41f92e54de5411b9195449dbef0960daaf4 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/7f/e42e1229b06d1307f6e7717c47f6bb4248fa2e create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/8f/a874178500f99d69f649ff9128f3d1b62369a0 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/b1/dfa9f82f0821f9decd33c52c9bfe0f0ff86b41 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/d7/cc3e41ea34ee3f9441b3a1493405d34f15c1cd create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/objects/f9/0ee43c5ddc18a1341e5d77f2319e4e00e5effc create mode 100644 test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master create mode 100644 test/integration/stashAllChanges/expected/repo/file0 create mode 100644 test/integration/stashAllChanges/expected/repo/file1 create mode 100644 test/integration/stashAllChanges/expected/repo/file2 create mode 100644 test/integration/stashAllChanges/expected/repo/file3 create mode 100644 test/integration/stashAllChanges/recording.json create mode 100644 test/integration/stashAllChanges/setup.sh create mode 100644 test/integration/stashAllChanges/test.json create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/FETCH_HEAD create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/description create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/index create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/24/35f1f9565ecb370eb550f591d55179f1e9a7de create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/78/3b58a50bb867917c6a8a78ff18cadb3fdc771e create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/8f/bffdd316c764e171c3e421205327588077f49c create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e2/21db5981b482fb2110c8b283f48c08cd5f10c3 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/e5/5d4f76f2b99c3b6b0c960725099ae54e34af70 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/heads/master create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/file0 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/file1 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/file2 create mode 100644 test/integration/stashAllChangesKeepIndex/expected/repo/file3 create mode 100644 test/integration/stashAllChangesKeepIndex/recording.json create mode 100644 test/integration/stashAllChangesKeepIndex/setup.sh create mode 100644 test/integration/stashAllChangesKeepIndex/test.json delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/logs/refs/stash create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/0d/b7c2bffa900585f06112e5b06f8f358638f447 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/1c/88e069f3e318f1e0e02188cf65d360ab4eab67 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/1e/a8d05b2cbc972b48eae3181e846f82eeab50ef create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/2c/c863db7c706a327ec5d0472ddd5d6001c6a5bf delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/87/82cd42420de6a24264417d43d50ada9aa53ad5 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/8e/724d42465144007f28d45514537886f527eef9 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/a2/11ee6ddb1146ba9680c58c08e40fa0162bd98d delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 create mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/f1/963e622e30276cf4e5880109ea475434d6f2ae delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 delete mode 100644 test/integration/stashDrop/expected/repo/.git_keep/refs/stash create mode 100644 test/integration/stashDrop/expected/repo/file3 create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/01/38b2ed57b0412b2c2244a267fc1396f06ac287 create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/2e/c2033bcc750a5c30ad6f00e6caa7b5848f26f0 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/5e/6c498354e93f4049e80254810f4577b180a8ab create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/60/5615b78c181314a7a019e116647bfdf9127c94 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/8b/0567b6e2fd39edce87bc7ed6e7ba7868e55930 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/a8/4a187f63b05bb43f19cfbc8bedab97ed33272d delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e create mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/b8/372ee9ddb68d8b15c440d86d21b6199583fb26 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 delete mode 100644 test/integration/stashPop/expected/repo/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/FETCH_HEAD create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/HEAD create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/ORIG_HEAD create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/config create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/description create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/index create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/info/exclude create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/515d20a02212d14a519d82917b791e01ebc659 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/2b/d62bafdea9ceb4732326e82d4ce14196d7a032 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/40/62b34fff18c4453edded2da4f0737176daaa4d create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/54/fbb8276359cb6f68faa9cb7dcf58f93c838035 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/b1/60a56c2580f8cc1e5432f32212f83395459997 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/objects/fe/0b6136ae74e574b3349fabbf0b89053c6a201e create mode 100644 test/integration/stashStagedChanges/expected/repo/.git_keep/refs/heads/master create mode 100644 test/integration/stashStagedChanges/expected/repo/file0 create mode 100644 test/integration/stashStagedChanges/expected/repo/file1 create mode 100644 test/integration/stashStagedChanges/expected/repo/file2 create mode 100644 test/integration/stashStagedChanges/expected/repo/file3 create mode 100644 test/integration/stashStagedChanges/recording.json create mode 100644 test/integration/stashStagedChanges/setup.sh create mode 100644 test/integration/stashStagedChanges/test.json create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/FETCH_HEAD create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/HEAD create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/ORIG_HEAD create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/config create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/description create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/index create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/info/exclude create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/3a/8dac53bf53e3243a325a9e0b3ef523764ee74d create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/74/244487ab29dc413ae1f98e4fa40256a0787212 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/84/988130b443577e2afc62d4103f92fcbed33add create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c2/71c5cc28c056383278c655b4e227fa69b06073 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c8/84f894908d3042f54995005b8e3445958b2fcc create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/ed/408704bb5eb653ceacee9ce485ef1bb0ea7a0b create mode 100644 test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/heads/master create mode 100644 test/integration/stashUnstagedChanges/expected/repo/file0 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/file1 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/file2 create mode 100644 test/integration/stashUnstagedChanges/expected/repo/file3 create mode 100644 test/integration/stashUnstagedChanges/recording.json create mode 100644 test/integration/stashUnstagedChanges/setup.sh create mode 100644 test/integration/stashUnstagedChanges/test.json 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 daebfa4ef6fda597412bbd7efb7150e89f3eec9d..1e08e259690c36f4254dfd74f5abaeaccb19eff3 100644 GIT binary patch delta 93 zcmbQq)W&4s;u+-3z`(!+#LP*NToqQaSFK<)P)v&9!v$FehQ=j8=@%e8(I97Hn8d^! mfr&@drP&yC4HXQyoE8T^Wl6Yow=8q&daDx?KmU}tw-Eq;*&adw delta 147 zcmZo;n#p9~;u+-3z`(!+#LS8BV&8~K-mVAHA}j7qV`N}pWm5c|!obkDgn@zaD^QKd zM1vd+ki5j##&!@bK5_F8sJb*{bwIUj6OX9tNirBK7;w$&Sk8OmhVG^H`>!&Vy{~xK dp}a@Ozpbn7RqCT7S-WaNLi3lcsVX==1pwY5HckKl 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 aab767a086e05e43391e8ca7089f727787fcb744..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0gaA93c@fD06pgwdlw{|WVc%p5qjz~vQ2^o(@Krt^X%NdBtxzH(lNl3_Kx$A9W4x++AqYt4gEan-vyfi32NGWVJse10IxI)+`Wt|X7 zQ6-TTVH4l&zHTs#a2dv1{>1ux2OCqQ_G56@5bmELpj2w+| zY?zYMM5w~2KGz+_32x)`$VVvKD_`PT?qJaNy4eolY>d{b(Kc1{pSqftln+=JDB<0z Q>+cF=e&tSm0rw0aƽۢ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 0000000000000000000000000000000000000000..51688c4dc6e22ed2ed38958764aa6667917b5f11 GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQTsOgqU0M1-z-jQmWn(AZKUczk;Vw~ue}^48kY zEe5*uL)8Wqi5^OpB2)^+nrdM{@3eYR6rmwy%4Uy;zPqg+aU2*D2MQ2?5xMw)qE&Gm zHBojHy)*ICU)y1)+1{u5so&W4Rd0D~4~vcgfSAc%fdI@|&#A6|a#NR8$@~CKYB=sM CwMP&D literal 0 HcmV?d00001 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 539f9791905e17d0a85ce5884381ce25c523a355..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmV-x0F?iD0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%?0_e#<81MUGLyr{r0}mCx!#I;FFa N6c}Sw005AMIi$QpFR=gs 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 0cdd88ea01086a9f483371d5a3ed867a033a7df4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmV;w06_nE0gaElY6LM1MN`jLs1F3ow)|K^2y8W7y3~>_k%jfnGI1cEpJ}#FdpY;O zY1W`mVn`?pJ+j t+js*^F}TA{37!$1TaNXJnEFqA`CLC>yTRb^<8yj6fL*TY{{SjyPcu(sUbFxJ 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 9dcd075d6e7cddcfdb4fbf70e13e4b441151aa9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NhYZQ5uvLdBWeC%p`oQj@c8x!ZXX}Kd24Oy zB&wHw03>h-Lyj?)EPe>72*CGTwX)5n+6axR)}&8=ZwHMNJ;v#UZ)*FB+q|_WNl?ck Y-aERAFq^ZUla4>RsmlsBKi88h)?zI;=>Px# 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 0000000000000000000000000000000000000000..59e0babdb1d0242a3ea6b2cde865d31a32e092b3 GIT binary patch literal 184 zcmV;p07w6L0gcbQY6C$Gh2hlu6w@1mMl+gA2*KdWRh~f_NhFZ*n)L?q_}M0X+QSEj zf2?zU?g4Xq+BdU6!@RQ_7fw}M_l{(kO}s`{8&Z-+hq~N(v)dkuL~qqdY93mvRwBii z3>txFH9$#2hyD2$y?Z7l8(an^aU{u1DOQx>a{No`B`y5Df2>=$T*K?-dbS^)_b+=M m>wF8b5C9-i4<|r?xwXd0P`G1V`uF~^ZsBqbub1oDe)_zB*|V(k kEkr^9NJtz`kN}pW9uvF$lP~YLF#F^1FQGs57X#i)V9-ie@&Et; literal 0 HcmV?d00001 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 f57ce417b7d66e70e33708d0443088b0af141a69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmV;p07w6L0gcZ+YD6&%1mM)~6z&&-e^)>=>j(TABmo1G4QcN>{8pc2HKsdAbXq-N$3Bf|2-#nqWVVJ}4*84KF zNq8BDh^`QbIWa@ZoHJHSt#HW6w`v6~kV}r7QF}h*J#=Ji&^Bt0MTl(i!KMfSYl9e> z+6hupQTa1o+o7jf->3O0-`w|AZoKt}Hsk>Sy+?fo1W>0vr-uBQtG29S)DOH*Io^5^ BMk)XR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..afb46a953eb37c576b041edeb4b4040a888bbc26 GIT binary patch literal 262 zcmZ?q402{*U|<4b=A=l@Z1xM;KVURaOp4*d!9@%VjZ1*iFCdtK%|gWL%7TAd+uj8q zdf&P9=A*q+O>Z%mZq5a89)eHCJkAwm&W z7OFWCJU@&Yl=hu_xoS~(Re#GX?fDk!5Oa*cx 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 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea6cd38669c9f73920911d2efdafe0a5b6bad32b GIT binary patch literal 85 zcmV-b0IL6Z0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h rTSy8F8IB*nWs~wE$Ee^_@+{%XXLTZ-(pg9fj0h<(#;O1SVZb>0{5mDa literal 0 HcmV?d00001 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 +|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 similarity index 100% rename from test/integration/stash/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 rename to test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 0000000000000000000000000000000000000000..6a6f2436255b8a831b87262c4d030c7d63af046b GIT binary patch literal 81 zcmV-X0IvUd0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U nND2%Yjvv2elky_RsNhrbEaA#$bt0Y8Sx5?uuqprm;XNz0$Rj03 literal 0 HcmV?d00001 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/62/4317ac2731648d4b0e30068dd35aca2a0b4791 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/62/4317ac2731648d4b0e30068dd35aca2a0b4791 new file mode 100644 index 0000000000000000000000000000000000000000..0a30073de843cf0a495948d842f1c666218099cd GIT binary patch literal 147 zcmV;E0Brww0gcX03c@fDKw;N8MfQTsOqxF^B6QVb#F+^e8e2*Pk8h9Q_VFzqZ>=re zVx~(!RINY^%$XT-;ZjIks85b1`zlV!K^XE71~hv)^xZ9G^&(s~0TXIT+i{v7`Yml=^~PJfTMQlmh?28cAOLgLbE@l~+|*@NG(QW^I&mx| BKpFr5 literal 0 HcmV?d00001 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6c/09c8b498849a1679bcd05488661a2ce123b578 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6c/09c8b498849a1679bcd05488661a2ce123b578 new file mode 100644 index 000000000..9727c4ec6 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6c/09c8b498849a1679bcd05488661a2ce123b578 @@ -0,0 +1,2 @@ +xA + E/qQK)r b nXK +lȬXAim3;-- \jiAGKrYE90)Exgݠ2r "7pFB=Zs.%%<͉?J \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6e/fac41f92e54de5411b9195449dbef0960daaf4 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6e/fac41f92e54de5411b9195449dbef0960daaf4 new file mode 100644 index 000000000..1a811f4f1 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6e/fac41f92e54de5411b9195449dbef0960daaf4 @@ -0,0 +1,3 @@ +xϻJAay{F>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 0000000000000000000000000000000000000000..2a1928079869c5c79e37d717252c0b2c211d73fe GIT binary patch literal 100 zcmV-q0Gt1K0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gvSTj#0s<X+NT>aA?;VO<;m0Fk`C0s@$`o>N`_=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..617e1b1b7ef688369a10eb77fbf273ca8ae48cf0 GIT binary patch literal 162 zcmV;T0A2rh0gaA93c@fDMP263=l z183u|Z6c6lM5T#*5q5~4DS6=#G>4SOXh$DPBqsCZO_l~pIYn<{3W%C>p{(SyYPK%v zQ0z!4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9a5aa9571a31ac952308b2c56a2ab9ec1c6995f9 GIT binary patch literal 161 zcmV;S0ABxi0gaA93c@fD06pgwdlzK0ZIg|N2tD-~X|jt2)0P^c&$k!vUWXZ&w3ISc zAnQ+c6M-Pi(PK`WnR2G6qvj5+ccPxfGE*}qN@k6l%oSK8`__8y5H*DCg1R=S21~3> zwxgrQg@`78>T}tkAK=yx57}c`Uvf!Hxr22_j703=jD% 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 0000000000000000000000000000000000000000..e633e1ab156d53457f4f434db14ccefdb69e6d08 GIT binary patch literal 262 zcmZ?q402{*U|<4b=A=l@Q}S8AYG5=_Op4*d(OV1*jZ1*iFCdtK%|gWL%7TAd+uj8q zdf&P9=A*q+O>Z%mZq5a89)eHCJkAwm&W z7OFWCJU@&Yl=hu_xoS~(Re#GX?fDk!5Oa*cx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..63c3eaa1198f3cb074564e50b11a007b48ce9393 GIT binary patch literal 161 zcmV;S0ABxi0gaB!3c@fD06pg`_Abaa?}&)dQ$Hh{Y_MROQX};9?Zvy-VFo6(TIUXO zaHqa8gSAA-V@Nrc?5#^BD2Y_aX|IWVi9UF(y;$SMO9wV4>*8#Y6hcyD2~)7>q`?p( z8_i0`;!wm-f3^+A32x)`;62v$#h29T9R_O|y2)08mZ`J^%m! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6a6f2436255b8a831b87262c4d030c7d63af046b GIT binary patch literal 81 zcmV-X0IvUd0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U nND2%Yjvv2elky_RsNhrbEaA#$bt0Y8Sx5?uuqprm;XNz0$Rj03 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..620eb2ec8aa70787cf382552416af5d741428b91 GIT binary patch literal 119 zcmV--0Eqv10gcT;3c@fDMq$@E#q0%{NvBBzB0^U^M$-JjLPMlP@c8x!ZXX}Kwbih+aEo@URHb8@_HSyD5?Vx#~`@B5yjrG0bwzm2paU(O^ Z!B2E$%WTeiPCEYNrffUd`~cWoE8LbTIoSXJ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ee4385f12cb5e2fea6044749c3960a2c40be7b9e GIT binary patch literal 28 kcmb4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..346dbdc7d917693747ad382ef628e7149cb667b4 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3d0}}K+&!}h5JGoH988V6tc=O#&M*9*aWfA<2Og>_VX5>_tw^- zO|qBKMRWlS%!wHiF_A4U)XYf9*W$!F2veHEWYj@j-a}(_*+=q_a}1aaa-c{UYc-Ln zWLFC#8d3Bauf6Me(f4_I%9q-)$&L5+&?a~QunwcXf(1}#J*S5J$yHr9G3p1=O*$CJ C7f1vE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5db9016237d1f9d0490bdb311233ef3d6be1f7f8 GIT binary patch literal 147 zcmV;E0Brww0gcW<3d0}}K+&!}h5JI88DpG4DTS`-rh&2QYJ$`e9ZXbW~rPaE2 zixXY?p=u{(jsdc8X3CjjNhN#0Flq^`$V@H?iP__!?{1X{bMg~o8kkBVL=aBIt_&=| zl6^VFnfU3icG!8b_j!5hH`aaAo3#3{IC=me7ua5b0L-c9RM$UqQ`Sw%`~avSIjWNc BL}UN} literal 0 HcmV?d00001 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 44fe0833f00a2c28f28ec4f13a6c54417fa26b2e..8256e1e361ac97a49ad43baf8076b6bed053e829 100644 GIT binary patch delta 136 zcmZo;YGX2R@eFciU|?VZV&X<--*6q923a7LVgp>YXN`UMD2G*FqiOkm;$ zwuu{9CT`=KSfii;RBma`e7yliL$&Qj)&>+~n|MS|J;~ G+BN_Wq$r*M delta 130 zcmZo;YGX2R@eFciU|?VZV&=qmagT(Hd>(*kAx?HjMg|5}CM70!28PBZ3=E84foeo1 z8mMT1l`+^FUSyRLeH8Mqy%@#KatdiAVHAN@nDEnE5$%&;D|D%B;>s K^PdOku>%0-O(xj@ 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 0000000000000000000000000000000000000000..3443df0982ed9bcf3de1eb96ff43614a4815b564 GIT binary patch literal 185 zcmV;q07n0K0gcbWN(3x$9svQCqaG)w|C2B8*D&;c_~&q+`r-BqmOx7P&!JuA literal 0 HcmV?d00001 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 24145cefe5d6422d1facb2ae6de393c5d5041043..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0gaB!3c@fD06pg`_AW>^k4+R2p{IUEl5VijG^Ix9=bMXnufq&Xs-?^g z6uMK}nZc4(%D70{PiT>>BzKh)k@3-!i9s9VGI_Cuo!16ax39hNnRSwm0+COh1a>iC z_NXZ%p%LNJUUi3Ig!?c)`3PlO_>yXQ0Fu!X(My6eqLiZ3KGpb7UCism2h&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;s$26 Y>OEcAGMlrWla4>RDa#5r2iRaM++^lEIRF3v literal 0 HcmV?d00001 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 8535af67cc32e9e5e4eea5f934d892197159292d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKU@e*BhA%8MMMf=|h_ge#xbiF8V50RVKTIZZy{I~D){ 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 6d84f0e3f6edb602eba4d7de82799c5b426e909b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0gaA93c@fD06pgwdlw{|#LZSj1W$d&Cf#76X-kdZ^Xp8z2R55!re;B3f&9x=%IzQ#a#0=m(Y=s=W5< P^1FgEPU_4Tf5<@*kXulD 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 782d5f0ee75e11eb8535d556b55865b2d66a72b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0gaAJ3c@fDKwak)*$Xn0F9RY%S3SmbGQmP)ONrp|%@N$b_ZCm~*4A#3 z+@+tYwm?oIBm%_3?21oyk<1ip@#;LJKp_P*2cP=xRse)_K^~5V3OVNN#8+Py)~FmX zQOwcsr@!{oPP4sF^Haavj!kc}w}-_PJRoKwdqo5=gN~`Lf99sHo1*yvn2jBpvon|@+_KJ=8=dWFvQh)66Jj!1}Rr~6dXKXo%NlYU@bpvKo; QoqtzQ=7*B`0(yr*MAq3&iU0rr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4fb5b0defc93f9ab390ae9f657dd383084363f19 GIT binary patch literal 146 zcmV;D0B!$x0gaAJ3c@fDKwak)*$Xn6{6R$Ms>hg2CRk`}DG@xrJ%ZcEd+>PceHq$h zyo^IcSBQZ*GeagO!fHb+94Y%&t)PYAvJ1|roep`Qp-`&e3v%HcvA858)+8gzg_cl+ ziU(ZIq?kUw?RmQ{@U0sM_RVlY`o AvH$=8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2a1928079869c5c79e37d717252c0b2c211d73fe GIT binary patch literal 100 zcmV-q0Gt1K0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gvSTj#0s<7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%?0_e#<81MUGLyr{r0}mCx!#I;FFa N6c}Sw005AMIi$QpFR=gs 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 0000000000000000000000000000000000000000..0179f5cc4466bfac7b1a00bf7824fee9e9e435fe GIT binary patch literal 182 zcmV;n07?IN0gcbGYC|y$h2hTkDZB@YY)i6TN(p4j)Mt=wi5BYIaN|NBzh1g`J$%D| z+CIkTbOH0zJXBrQ3dW7Gs{{ZP&Zt6Ug>tFMSEQa;c)QD?x9Q9mj>;iugpjxyD&-6w ziV7yeh@CBn{(0y%wNTBZ08l0a_C6?8V9ORMbIgXAHu;_(`{6EE_jzc_jHUti8iK1hvR2mk;8 literal 0 HcmV?d00001 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 20498e40d227b9506ac3b8173c7e3f2b55721dee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmV;u07CzG0gaElY6LM1MN`jLs1F3o57}Nq2y8W7y3`s=A`9!CW#T|SKW?^9dpMWN zX?yRN0iOKRI8-4uwaTVU9I}*Z)hG2)H_OPPZKEJ)E-!aJ^fo}ekCl=yrlGk^OjOz= zta)R!f`JSPNO|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 57420d0275bc06c633987c2b5497508b4547435c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmV;n07?IN0gcZ=Y6CG0h2gH}6y67dWy`XrloH4)tDHf$WLl^*Vd6rMUvIL{_UGfl zt6T5i!v*BGv70%fQY!nksx)QFwXHGu(n?0gQn(4PjL6GfcDoIyA>c|WaI;u_CL!WF zi&!oKjUiG40(^SXsZ`jDX#({iiRPrWm>VL1XwjT%TI6?pZM!>P+{gKHvOnqfA3N5q ke>xzH9)Nvx2LSJvS?7siFY@Jjb6pZ(OfN`glAR=RxJ3<_Wt2LI zSY8FaU}Q(ebobHNlgzWnZ6hwJP%JU#%+ddb3Yyng^E%0Q|J)BaE%0($-t0%(?P5>5 sw^u+;F(8(}@Q4_~H0U_d?VtMevAn~6g(hF4dA@%DKVOV~0rmMzBDT9=umAu6 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 0000000000000000000000000000000000000000..3fd7331e6863cdf73414cfd8d95f226ceead0fa3 GIT binary patch literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V0^jsJnqu3OVH&#$9P3)(|Z8`OOo0oM8@=Tdixi zZp2GJRPCtDi9j+7qX?$56baxcY9Us~jKh*Kn>`)+?v|C%i$@=W^B#Z-viNX97>GHR zfTUVRlRo{`4m-{EKFv@4rn+x>%dI}Fiva-86WJ>ufI00s)%DNZlyy@yKQH$Zo$hpc77<}jd-5APlMV`IXPJ%Q=Nk{+y%w(u zYTJAN7!X+>#^DZ0QjDC7kXB46DM(&J6=5wZT#T4=6J2h0_;o;?dYv6@PFu)gBD&4Q zJQu^JNYYS{|2(=hwv-yx8bw(nDN)Ws?RQAg+e&LLi+zpv{ebfYp3j$8|F(Yn^rvm_ kFMz@n5H$!qB8ITcbe6V$u?0Msu>Py?J)1^@s6 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 1c25c6cf67833025f6f6363320d79391c166569b..0850077fddf2ff6ed10d14e2a02b11809beaa05e 100644 GIT binary patch delta 93 zcmbQq)W&4s;u+-3z`(!+#LP+2Hy)|(k1B@IKrtzXPp2Xo7#f!VrC)&XM1!1(VGO*Dw$!(s`8m($z1vP5EJE`m<1Q>rUL*PZyl5X delta 147 zcmZo;n#p9~;u+-3z`(!+#LS8B;zbqz3f}_J3X^&Z7#SE?nUvVw85kOuFfcHF1*#F5 zXpo};l2^H#a|J{z*R7ccRp*7Q4ycxG;t_Q{Nd{vD1Fm@;%Xv@S(7m*N|5e7a_Z1I2 dl=tZLeF%7MDEoAM7=xb6qWzm!?Gnoj006hEFChQ` 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 SJoc2wn9UlgR`NjV&R9$G1mt`}h`*_tw^- zF`3KgBD%m7m=iN3Vj@#)sF^29z7{LSLU73ihw7j%@1bLch=nr<*5W0_UgOswTDɍ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 0000000000000000000000000000000000000000..22dbe19c0e7a5631d20297911d48cf478d161106 GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0@2&ANe73OVH&x~?=3n-DDY`OOo09R_A(Yi;S) zjdMq&2cSX7pK5%$^Q?cMHyQMlD0k5FBO{#1Ilvtm6Dg z6(|XEH0je{+hM2K-lzGg-_-V1Z?d(Ab#w-p0+GD}0+^GYQ(gbmOo5b8=UT@G z0sCEB%|I;q!kK9>4c?QokZFwN80DCHOcaNnmEEGNO$~%QqApm$9#tvHAjTpkqeZ3| zD5lb}W~cA=m{+*n;e5Ma?W1*h+9A*N0?5>PM2QT0MDN{3x2a}->Ta9{`@lRw)z?;? PepgV&rv>)~SFb?Z2l7$U 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 24d309c9e22283e00444c6d7cba25ab5b777b465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93d0}}MZ5MC?hC~kHBO+ELRLA(s3Q%;8iIu$zaF8>_j!C?YPD`% z!;F`His)I0IGCI$6XuLuV#(e>n4|;}AVM1xCUx*B@2)M26QA9TW~dP&C$tWy0ce9q zH;$q>Q2gnycIsu-_ho&`m+P_1Ew%d4Fga@g$fLdj7^B8IqPqO4tFrBa>IVWKI$b3r BMRWiF 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 0000000000000000000000000000000000000000..5634f803139e66529b1034585c9d420b3b391878 GIT binary patch literal 183 zcmV;o07(CM0gcZ+Y6CG4K;hJT3iXDd(a($&f-$&ql{3spGb9js%~}Q@-`k{5`}msI z)-isj3#q)#P1WV5R@s!1BlS|PhO8l}7y)-}g0X{nT5i1QbvpDJAq$lT1tKIS_D~f7 zF_Boe3V~Wpf1XQXC}bGLXOR>QYBOm?w6j#w9%G=;7kU@!H^;;cziuVw~r6rQcGDI ziR!KG00}y{A$spqlzwm_3BY5_n%Tybt%rJ5Yr?O6>Q2*4&uM<+2<5xsvDES+aoVxS Y*bCi7n9WtMNyDGqV!Z 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 4541e3cc903ca4b278638483bf5d52842ef6e4ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmV;n07?IN0gcbGY6CG0fZ@*f6y5_xwq#i@r35l%>N7~TObc}`T&~c^?=9WC{(Q^d z);T}-kVu~P%{?%iHG$f?jxJo=6LWP`+dP<2Kp($22K`1Dt)M1Uy9#M-AR^q}lj?S`;k#k_r*0Nf|CQAd-Jz*amCuHo<1{XAXK_s#+ z<|%tLE_tiMr#$wEzGB literal 0 HcmV?d00001 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 8ebf85670da8fb2010e03ed16d2ca9dd0ae10270..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0gaA93c@fD06pgwdlw{|Y}2iX2tD-~n{Be#uh~=^2i#Pb3$zb zHIAB?eUN12Q=iKQ{Q$Rqc<3%=ed#4Fv@%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 026ea2da19fad2fe2217aa5edb029d408feebac3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmV;v073tF0gaEbY6LM11yk==xDNzbl4bh{A#l}p=~BzKOb*Vs$Hswtezv(j?RzuD z)NPE*bSU^VcQY5N^{m}glwwP{XAFjHrAM#LY7uI_LtO5<+ikie#7t=2AHQ-*Et#a$ ztG6H=kVEMtS|5A?06|g+ShyjgRHmYor6ht#Ddrp*Y|)?jwe9Y_y4UmiZofM2S9_`3 scynHu!21-~J$nzZ9P1G=?VtGaxqi6q=7xSB&gs$M`sHf)2SZ#nG>CH!br<&ekU`@-+Ni_g!!3RL*Ai&Z+kN>Ks-uMy`8pV_EbRod2rTZ$x97BX6 ztSnS>BzS%pH7M;n_j1*u@T&fnSK9L})FI{=fpsTEaxn@EZ*qpwKtYhdKBM`I=lJnk zHYqQ1j0!#_&l0YDRwvRaodq$+7;H{RkgF?@!N#C#s9?ZV@-y7w`~;8HtAt%N-tvbW JWZgQY5CG)rR=5BF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea6cd38669c9f73920911d2efdafe0a5b6bad32b GIT binary patch literal 85 zcmV-b0IL6Z0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h rTSy8F8IB*nWs~wE$Ee^_@+{%XXLTZ-(pg9fj0h<(#;O1SVZb>0{5mDa literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0f1ad7e2f6b933bb926fc3f8af2f726d07238323 GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSBCVvwU5xVLz(#Zr1jV&R9$G1mt`}h`*_tw^- zO~T9QB033Cj!>8iVJVpFQi}%@gVac3h|n&Ktd88}J@jG%WFHtkK_zA*-dU^`(O@NO zlXpI)6jlC=*WUFs>-#i6<(u2F$&L5+&?a~QK!;9W0Rhxm9Qa#hz&Q2hW)yEwy| CdPSB1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1b07a5cbc28f199fff1ccc844654d961d5b1ef01 GIT binary patch literal 160 zcmV;R0AK%j0gaA93c@fD06pgwdlzJPleCS92tD-~+hl_U)0SGH&o>wEUWXZ&xRf&O zz|@}hO%+_WNExlPIYciuhE9Yjq=cC|Ct0J->^if`rgIHPPd+gUG7~3q;;Y(s7)>Smgg9E4M4WNyG$nl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c GIT binary patch literal 21 ccmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2fe4f5acdc5783bf6b3760d173ab1c8c009e0c81 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{8K|012+}V+tYUB*W-q7JzT5SYb`MXn+MXb@9_*ZKr9b`!qlCjrG0Zvb6dj@dGof YsnMC0*&X$mbo|L(SvRoz0oCp+%zP_4y8r+H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6dc24b6d3f0861996a9ca282c858243754710a62 GIT binary patch literal 107 zcmV-x0F?iD0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8IB*nWs~wE$Ee^_@+{%XXLTZ-(pg9fj2I+%ei$_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..333da1d7e89c078282ccfa1e553f903344f3f220 GIT binary patch literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MfQSBCey@#h|pD!F`b!U!PrtFczk;Vx1YE8vbMH# z9}1rOZsrwo5-B23SeQ{`siE;2>+Z+N-^S@-UvAsWF0!_}4`~1ZBqV#fU0q%l+z;EDIvQSg BM?e4o literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ee4385f12cb5e2fea6044749c3960a2c40be7b9e GIT binary patch literal 28 kcmb4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6524d6dfdd5728432601ba48d1de6655068bd7c1 GIT binary patch literal 187 zcmV;s07Uf2)J^UXIN=halrDKI|cIikt?@prWn2{ zrmnqz4?{k_j7` 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 0000000000000000000000000000000000000000..6d965fc2eeed7c17d2a23738e2122ba3769aceed GIT binary patch literal 262 zcmZ?q402{*U|<4b=A=k2cFDZuRWKSTCdKgKa^rneYa(=u~X4S-r07(n`^tfY!zG}N56Xy))7KYq(5r9FO4)R78 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c GIT binary patch literal 21 ccmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6a6f2436255b8a831b87262c4d030c7d63af046b GIT binary patch literal 81 zcmV-X0IvUd0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U nND2%Yjvv2elky_RsNhrbEaA#$bt0Y8Sx5?uuqprm;XNz0$Rj03 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3a76ae79effe1c72a419c2210cf38012f46a303c GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0@2HQ9wy3OVH&x~?=3n-DDY`OOo09cEx;Yi;S) zF<$ziYFUZW2t}w6mV&9~S|Ye{&^nSjBJ^2M%$^Q?cPm7p5(fq<9s<@Fm?J>Uq&|em zkup{hlRo{m9d?@SeVU*8O>JNGCR=-0H=F@r@NBPu0Oq9URM$UsQU@!4Q!YJbpbww~r6rQcGDI zS&>^i0J7-dhp4J4+J5jMS%9B0OJ)~Sb_!7uXTrCA>Os>?uW5ec3}xT&SZW!``ktAc YbV_%2%;u`sq~T9)^16Y|57)jc*!@d5lmGw# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9eb55491472fd9e6f7fe5d602e168001cf8a1a52 GIT binary patch literal 185 zcmV;q07n0K0gcZwY6CG4M&Z-F%j?zUcsexd#YQSMH|DN$cx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ee4385f12cb5e2fea6044749c3960a2c40be7b9e GIT binary patch literal 28 kcmb4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..92422c064dd6d8da7d13d1eea47a39ec57021bbf GIT binary patch literal 148 zcmV;F0Biqv0gcWv3d1lAK+(=Vh4(^{CC84SltQK)Ly=_~NSY8_=<%B)bp5>H>$a|Q z^MUcw4l`dMCskGj78SulsZN@OyIRPQAVrQT2Di&$@87^%zIP^u;@F#uJ@ zs*@EWDaFaBy|%*-qrVU1)4sCqi`{fvA3mfG05B5!Dp9izPwwixSa3g*wK<@8 CD@UvV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b7c7df645bc8e489f7be3691c80d36c37b6b6b2a GIT binary patch literal 176 zcmV;h08jsT0gaA9YQr!PMZ4B1W?v}d$wV4K2!X6}hLXid9@&Q24z>bqPhTA&yZ;}b z$It6LPZfyhqi$y4eM(s{=3YxLKI9S)gsG&!!YN5niNY-Ishceo0u#3yG*Rp`cL%ku zL@_SPNJp<2Bv40AUv*qJxZdD&y 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 }