From 14b9a0b64730dca8ce4ab50134268dc9251c0160 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 24 Jan 2022 19:05:12 +1100 Subject: [PATCH] stop skipping stash warnings --- docs/Config.md | 2 +- pkg/config/user_config.go | 2 +- .../stash/expected/.git_keep/ORIG_HEAD | 2 +- .../stash/expected/.git_keep/index | Bin 281 -> 281 bytes .../stash/expected/.git_keep/logs/HEAD | 12 ++++----- .../expected/.git_keep/logs/refs/heads/master | 6 ++--- .../stash/expected/.git_keep/logs/refs/stash | 4 +-- .../05/f4edebb0aadc631926ea90f2f4f74033127a19 | Bin 146 -> 0 bytes .../1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 | 1 - .../21/1d7ffb63edc061a144eb1e198d94768000c723 | Bin 148 -> 0 bytes .../25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc | Bin 0 -> 161 bytes .../2e/fac8148440778cbddcd80ac7477981277dcffe | 1 + .../3b/29b35d4357f8e64cafd95140a70d7c9b25138a | Bin 0 -> 162 bytes .../40/0778244da4711bc99a7b1a84bab99213601a4e | 2 -- .../4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d | Bin 0 -> 147 bytes .../5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 | Bin 164 -> 0 bytes .../7c/00a9fdad735ecd011f92c03295ee7e784ca1cc | Bin 162 -> 0 bytes .../85/d387b0ab853a34de01344e8ca614fe8ea58318 | 1 - .../a6/ada9f3d895e751ec289c69913a02146c0ca844 | Bin 0 -> 191 bytes .../a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b | Bin 0 -> 118 bytes .../df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff | Bin 118 -> 0 bytes .../e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 | Bin 0 -> 184 bytes .../f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 | Bin 0 -> 147 bytes .../expected/.git_keep/refs/heads/master | 2 +- .../stash/expected/.git_keep/refs/stash | 2 +- test/integration/stash/recording.json | 2 +- .../expected/.git_keep/COMMIT_EDITMSG | 0 .../expected/.git_keep/FETCH_HEAD | 0 .../expected/.git_keep/HEAD | 0 .../stashDrop/expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 0 .../expected/.git_keep/description | 0 .../stashDrop/expected/.git_keep/index | Bin 0 -> 262 bytes .../expected/.git_keep/info/exclude | 0 .../stashDrop/expected/.git_keep/logs/HEAD | 7 +++++ .../expected/.git_keep/logs/refs/heads/master | 3 +++ .../expected/.git_keep/logs/refs/stash | 1 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin .../1e/6f4a55f3dd26848238337763f249681ef9397b | Bin 0 -> 160 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin .../56/52247b638d1516506790d6648b864ba3447f68 | Bin 0 -> 127 bytes .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 0 -> 81 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 +++ .../6d/c07da80aed51d01a56a89ef37f4411adbd75c5 | Bin 0 -> 161 bytes .../76/05fecac5dee01fb9df55ca984dcc7a72810f48 | Bin 0 -> 145 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin .../9f/2757166809c291c65f09778abb46cfcc4e4a0c | Bin 0 -> 107 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin .../a6/ed180e13649885eed39866051ca0e25c0ad6ac | Bin 0 -> 189 bytes .../c0/0c9eb1ae239494475772c3f3dbae5ea4169575 | 2 ++ .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 0 .../d2/2496528fe3c076a668c496ae7ba1f8136f1614 | 3 +++ .../e0/61c8716830532562f919dcb125ea804f87ca2b | Bin 0 -> 182 bytes .../e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 | Bin 0 -> 190 bytes .../f4/f81b6542e98a2f80269449674b0f8f454b74b0 | Bin 0 -> 182 bytes .../expected/.git_keep/refs/heads/master | 1 + .../stashDrop/expected/.git_keep/refs/stash | 1 + .../{stashFiles => stashDrop}/expected/file0 | 0 test/integration/stashDrop/expected/file1 | 1 + .../{stashFiles => stashDrop}/expected/file2 | 0 test/integration/stashDrop/recording.json | 1 + .../{stashFiles => stashDrop}/setup.sh | 0 test/integration/stashDrop/test.json | 4 +++ .../stashFiles/expected/.git_keep/ORIG_HEAD | 1 - .../stashFiles/expected/.git_keep/index | Bin 334 -> 0 bytes .../stashFiles/expected/.git_keep/logs/HEAD | 4 --- .../expected/.git_keep/logs/refs/heads/master | 3 --- .../expected/.git_keep/logs/refs/stash | 1 - .../14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 | Bin 148 -> 0 bytes .../28/59c9a5f343c80929844d6e49d3792b9169c4da | Bin 85 -> 0 bytes .../5e/1c4f2926fa291fbd2f95095429c75bc1148693 | Bin 118 -> 0 bytes .../6c/a18002905d50a6a77808f8b7d50839f68da7b7 | 1 - .../bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac | Bin 161 -> 0 bytes .../ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 | 3 --- .../expected/.git_keep/refs/heads/master | 1 - .../stashFiles/expected/.git_keep/refs/stash | 1 - test/integration/stashFiles/recording.json | 1 - .../stashNewBranch/expected/.git_keep/index | Bin 353 -> 353 bytes .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../stashPop/expected/.git_keep/FETCH_HEAD | 0 .../stashPop/expected/.git_keep/HEAD | 1 + .../stashPop/expected/.git_keep/ORIG_HEAD | 1 + .../stashPop/expected/.git_keep/config | 10 ++++++++ .../stashPop/expected/.git_keep/description | 1 + .../stashPop/expected/.git_keep/index | Bin 0 -> 281 bytes .../stashPop/expected/.git_keep/info/exclude | 7 +++++ .../stashPop/expected/.git_keep/logs/HEAD | 7 +++++ .../expected/.git_keep/logs/refs/heads/master | 3 +++ .../expected/.git_keep/logs/refs/stash | 1 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3a/e4e5d4920afbb1bac23426afb237524c8dbe41 | Bin 0 -> 147 bytes .../43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a | 1 + .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 0 -> 81 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 +++ .../82/cc524693ae9fb40af0ed8ab7e22581084dcd17 | Bin 0 -> 161 bytes .../86/34432ef171aa4b8d8e688fc1e5645245bf36ac | Bin 0 -> 147 bytes .../8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b | Bin 0 -> 118 bytes .../8b/d86c566a91e9f8ace9883f7017f562c971b3f7 | Bin 0 -> 182 bytes .../8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 | Bin 0 -> 100 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../b0/00623a052b4d2226c43ba396b830738799740e | Bin 0 -> 162 bytes .../c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 | 1 + .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c | Bin 0 -> 190 bytes .../expected/.git_keep/refs/heads/master | 1 + .../stashPop/expected/.git_keep/refs/stash | 1 + test/integration/stashPop/expected/file0 | 1 + .../{stashFiles => stashPop}/expected/file1 | 0 test/integration/stashPop/expected/file2 | 1 + .../{stashFiles => stashPop}/expected/file3 | 0 test/integration/stashPop/recording.json | 1 + test/integration/stashPop/setup.sh | 24 ++++++++++++++++++ test/integration/stashPop/test.json | 4 +++ .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../stash_Copy/expected/.git_keep/FETCH_HEAD | 0 .../stash_Copy/expected/.git_keep/HEAD | 1 + .../stash_Copy/expected/.git_keep/ORIG_HEAD | 1 + .../stash_Copy/expected/.git_keep/config | 10 ++++++++ .../stash_Copy/expected/.git_keep/description | 1 + .../stash_Copy/expected/.git_keep/index | Bin 0 -> 281 bytes .../expected/.git_keep/info/exclude | 7 +++++ .../stash_Copy/expected/.git_keep/logs/HEAD | 6 +++++ .../expected/.git_keep/logs/refs/heads/master | 3 +++ .../expected/.git_keep/logs/refs/stash | 2 ++ .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc | Bin 0 -> 161 bytes .../2e/fac8148440778cbddcd80ac7477981277dcffe | 1 + .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/29b35d4357f8e64cafd95140a70d7c9b25138a | Bin 0 -> 162 bytes .../4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d | Bin 0 -> 147 bytes .../56/52247b638d1516506790d6648b864ba3447f68 | Bin 0 -> 127 bytes .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 0 -> 81 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 +++ .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../9f/2757166809c291c65f09778abb46cfcc4e4a0c | Bin 0 -> 107 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a6/ada9f3d895e751ec289c69913a02146c0ca844 | Bin 0 -> 191 bytes .../a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b | Bin 0 -> 118 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 0 -> 28 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 | Bin 0 -> 184 bytes .../f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 | Bin 0 -> 147 bytes .../expected/.git_keep/refs/heads/master | 1 + .../stash_Copy/expected/.git_keep/refs/stash | 1 + test/integration/stash_Copy/expected/file0 | 1 + test/integration/stash_Copy/expected/file1 | 1 + test/integration/stash_Copy/expected/file2 | 1 + test/integration/stash_Copy/recording.json | 1 + test/integration/stash_Copy/setup.sh | 24 ++++++++++++++++++ .../{stashFiles => stash_Copy}/test.json | 0 157 files changed, 186 insertions(+), 37 deletions(-) delete mode 100644 test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 delete mode 100644 test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 delete mode 100644 test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 create mode 100644 test/integration/stash/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc create mode 100644 test/integration/stash/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe create mode 100644 test/integration/stash/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a delete mode 100644 test/integration/stash/expected/.git_keep/objects/40/0778244da4711bc99a7b1a84bab99213601a4e create mode 100644 test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d delete mode 100644 test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 delete mode 100644 test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc delete mode 100644 test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 create mode 100644 test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 create mode 100644 test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b delete mode 100644 test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff create mode 100644 test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 create mode 100644 test/integration/stash/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/COMMIT_EDITMSG (100%) rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/FETCH_HEAD (100%) rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/HEAD (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/ORIG_HEAD rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/config (100%) rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/description (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/index rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/info/exclude (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/logs/HEAD create mode 100644 test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashDrop/expected/.git_keep/logs/refs/stash rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 (100%) rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a (100%) rename test/integration/{stashFiles => stashDrop}/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 (100%) create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 create mode 100644 test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 create mode 100644 test/integration/stashDrop/expected/.git_keep/refs/heads/master create mode 100644 test/integration/stashDrop/expected/.git_keep/refs/stash rename test/integration/{stashFiles => stashDrop}/expected/file0 (100%) create mode 100644 test/integration/stashDrop/expected/file1 rename test/integration/{stashFiles => stashDrop}/expected/file2 (100%) create mode 100644 test/integration/stashDrop/recording.json rename test/integration/{stashFiles => stashDrop}/setup.sh (100%) create mode 100644 test/integration/stashDrop/test.json delete mode 100644 test/integration/stashFiles/expected/.git_keep/ORIG_HEAD delete mode 100644 test/integration/stashFiles/expected/.git_keep/index delete mode 100644 test/integration/stashFiles/expected/.git_keep/logs/HEAD delete mode 100644 test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/stashFiles/expected/.git_keep/logs/refs/stash delete mode 100644 test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 delete mode 100644 test/integration/stashFiles/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da delete mode 100644 test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 delete mode 100644 test/integration/stashFiles/expected/.git_keep/objects/6c/a18002905d50a6a77808f8b7d50839f68da7b7 delete mode 100644 test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac delete mode 100644 test/integration/stashFiles/expected/.git_keep/objects/ee/9c2e33476df0ea209b0458006d8f6a0f03d2a1 delete mode 100644 test/integration/stashFiles/expected/.git_keep/refs/heads/master delete mode 100644 test/integration/stashFiles/expected/.git_keep/refs/stash delete mode 100644 test/integration/stashFiles/recording.json create mode 100644 test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stashPop/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/stashPop/expected/.git_keep/HEAD create mode 100644 test/integration/stashPop/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/stashPop/expected/.git_keep/config create mode 100644 test/integration/stashPop/expected/.git_keep/description create mode 100644 test/integration/stashPop/expected/.git_keep/index create mode 100644 test/integration/stashPop/expected/.git_keep/info/exclude create mode 100644 test/integration/stashPop/expected/.git_keep/logs/HEAD create mode 100644 test/integration/stashPop/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stashPop/expected/.git_keep/logs/refs/stash create mode 100644 test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a create mode 100644 test/integration/stashPop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac create mode 100644 test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b create mode 100644 test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e create mode 100644 test/integration/stashPop/expected/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c create mode 100644 test/integration/stashPop/expected/.git_keep/refs/heads/master create mode 100644 test/integration/stashPop/expected/.git_keep/refs/stash create mode 100644 test/integration/stashPop/expected/file0 rename test/integration/{stashFiles => stashPop}/expected/file1 (100%) create mode 100644 test/integration/stashPop/expected/file2 rename test/integration/{stashFiles => stashPop}/expected/file3 (100%) create mode 100644 test/integration/stashPop/recording.json create mode 100644 test/integration/stashPop/setup.sh create mode 100644 test/integration/stashPop/test.json create mode 100644 test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/stash_Copy/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/stash_Copy/expected/.git_keep/HEAD create mode 100644 test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/stash_Copy/expected/.git_keep/config create mode 100644 test/integration/stash_Copy/expected/.git_keep/description create mode 100644 test/integration/stash_Copy/expected/.git_keep/index create mode 100644 test/integration/stash_Copy/expected/.git_keep/info/exclude create mode 100644 test/integration/stash_Copy/expected/.git_keep/logs/HEAD create mode 100644 test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/stash_Copy/expected/.git_keep/logs/refs/stash create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 create mode 100644 test/integration/stash_Copy/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 create mode 100644 test/integration/stash_Copy/expected/.git_keep/refs/heads/master create mode 100644 test/integration/stash_Copy/expected/.git_keep/refs/stash create mode 100644 test/integration/stash_Copy/expected/file0 create mode 100644 test/integration/stash_Copy/expected/file1 create mode 100644 test/integration/stash_Copy/expected/file2 create mode 100644 test/integration/stash_Copy/recording.json create mode 100644 test/integration/stash_Copy/setup.sh rename test/integration/{stashFiles => stash_Copy}/test.json (100%) diff --git a/docs/Config.md b/docs/Config.md index ab701623c..b83346610 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -44,7 +44,7 @@ gui: show: true mouseEvents: true skipUnstageLineWarning: false - skipStashWarning: true + skipStashWarning: false showFileTree: true # for rendering changes files in a tree format showListFooter: true # for seeing the '5 of 20' message in list panels showRandomTip: true diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 2b79f941f..a9977bdf6 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -327,7 +327,7 @@ func GetDefaultConfig() *UserConfig { ScrollPastBottom: true, MouseEvents: true, SkipUnstageLineWarning: false, - SkipStashWarning: true, + SkipStashWarning: false, SidePanelWidth: 0.3333, ExpandFocusedSidePanel: false, MainPanelSplitMode: "flexible", diff --git a/test/integration/stash/expected/.git_keep/ORIG_HEAD b/test/integration/stash/expected/.git_keep/ORIG_HEAD index 43680a2d9..78e4eb58e 100644 --- a/test/integration/stash/expected/.git_keep/ORIG_HEAD +++ b/test/integration/stash/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -05f4edebb0aadc631926ea90f2f4f74033127a19 +f348ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash/expected/.git_keep/index b/test/integration/stash/expected/.git_keep/index index 705b3a73be791ef63776e5b9234c6bbfad9a65f7..daebfa4ef6fda597412bbd7efb7150e89f3eec9d 100644 GIT binary patch delta 93 zcmbQqG?Pii#WTp6fq{Vuh?x`L#l8`fyj>5XMONIK#>l|H%B1)^Wui)j1V~KcYhycz l7N5BJ2UIR?;+8-W|F*8SSE-MVWbLX63C&-&rmEoh6aW}0CM^H} delta 93 zcmbQqG?Pii#WTp6fq{Vuh?x_z5Atcw5%~b485tN@*mQS1n5a@A0TdI}KBBW3MnmLw f7Ejy~DAMl!!qH&u`~RkPHziLk^ 1617674510 +1000 commit (initial): file0 -df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff 211d7ffb63edc061a144eb1e198d94768000c723 CI 1617674510 +1000 commit: file1 -211d7ffb63edc061a144eb1e198d94768000c723 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674510 +1000 commit: file2 -05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674513 +1000 reset: moving to HEAD -05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674513 +1000 reset: moving to HEAD -05f4edebb0aadc631926ea90f2f4f74033127a19 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674517 +1000 reset: moving to HEAD +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011558 +1100 reset: moving to HEAD diff --git a/test/integration/stash/expected/.git_keep/logs/refs/heads/master b/test/integration/stash/expected/.git_keep/logs/refs/heads/master index 0dd71a278..d1bf421f8 100644 --- a/test/integration/stash/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/stash/expected/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff CI 1617674510 +1000 commit (initial): file0 -df8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff 211d7ffb63edc061a144eb1e198d94768000c723 CI 1617674510 +1000 commit: file1 -211d7ffb63edc061a144eb1e198d94768000c723 05f4edebb0aadc631926ea90f2f4f74033127a19 CI 1617674510 +1000 commit: file2 +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 diff --git a/test/integration/stash/expected/.git_keep/logs/refs/stash b/test/integration/stash/expected/.git_keep/logs/refs/stash index 2815df3de..3f07cf22e 100644 --- a/test/integration/stash/expected/.git_keep/logs/refs/stash +++ b/test/integration/stash/expected/.git_keep/logs/refs/stash @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 1abf1a2a5d2e97b92e49391b4c92f945b5283606 CI 1617674513 +1000 On master: asd -1abf1a2a5d2e97b92e49391b4c92f945b5283606 400778244da4711bc99a7b1a84bab99213601a4e CI 1617674517 +1000 On master: asd +0000000000000000000000000000000000000000 e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 CI 1643011556 +1100 On master: asd +e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 2efac8148440778cbddcd80ac7477981277dcffe CI 1643011558 +1100 On master: asd diff --git a/test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 b/test/integration/stash/expected/.git_keep/objects/05/f4edebb0aadc631926ea90f2f4f74033127a19 deleted file mode 100644 index 14ea7d52a09ed59b15295fc8bc36edde83a49e2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V4QDjjm8iA*Vb;-IWGn6M}_4zdoVYVHl?Dt*u={ z#7jR#bQGc#3>RWTW=u6#o(u#pHIM)i+FY=xBc1Z@8UZ-en!Ob+#zO+e6Q#&@fmAySQ_>m880;8`md^PBp>hhbeQ4AEC=Rh#HkY Am;e9( diff --git a/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 b/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 deleted file mode 100644 index 100e8dc01..000000000 --- a/test/integration/stash/expected/.git_keep/objects/1a/bf1a2a5d2e97b92e49391b4c92f945b5283606 +++ /dev/null @@ -1 +0,0 @@ -xϱj1 Eu]J dge\-ݻ|˯3D*Os7 9v^2yc*Zq).fɺ"]sIN)adYzi55*XW36.|Ϗmkx\#eϺ93 `911|y!ÿy_&KF \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 b/test/integration/stash/expected/.git_keep/objects/21/1d7ffb63edc061a144eb1e198d94768000c723 deleted file mode 100644 index f30621f1bec7a1c0f50dd651d4620bf56b144cb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3d0}}K+&!}h5JHr)Hn*I6tc=OCNm=q#3lp_J$`e9Za;7Fd24Oy z7K*?0L)D7I#9WwNAtv$?Qk@y83{`^q;8H9xMKC)Z`tDY0=2_Tj5vGiD2E`nRQ8Gm0 zB%TUmt%g4RwH%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&tSm0rwg>,GΌ - -yZ4orn3@vnjo%b*ə %(>W!.^k)IDMJw'|/=?=\r=ۏ=m,ȅ)#rGĴ>J` \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d b/test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d new file mode 100644 index 0000000000000000000000000000000000000000..bc099c320aee7bfb2e74116c57a07b0d07611395 GIT binary patch literal 147 zcmV;E0Brww0gcX03c^4PKw;N&irEV?ng4)@&{dC-W)dv4wv-V(zCD85$G3RAt?S$^ zpuhA(#5PwlGcr3QCh{$0owyJtZ9#l+IbzHa%ua{AyQR{aB%jp_232ykV$n&NJY!{v zj;d0c41M}*JM1vp`!GJ`OY6SKjkon-A;;hVQVRA8;G8+@Io0J)ZggG*%nvf*I?q4i BM}GhS literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 b/test/integration/stash/expected/.git_keep/objects/5b/9476fbb5d3283ab920b724fe91b9dff40a5c29 deleted file mode 100644 index 391a716d7e7059d1eaf57bf5070d465bffac3845..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0gaA9YQ!)M0DJZ;bT1UimZfAVrLd=ch8)W@uuhiLg?)Z=>Alxs24>lN zUk60emvOj5mK-B%ku+7xBpF3#tRg&>Nw`>I)+SSU*x}m%%#FQzDQH#~Ni;`so3X{l zO&L?7s77yNv?Eqng}5>iplr0`0J7*2Xl4gaSe)~)&z_6@py SpVj5>3fg-27=8hI-#~o2AW(z= diff --git a/test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc b/test/integration/stash/expected/.git_keep/objects/7c/00a9fdad735ecd011f92c03295ee7e784ca1cc deleted file mode 100644 index 10d9df475c2b5f3f1a1f5612b553a537bb56ba47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0gaB!3c@fD06pg`_Abcg(L6*%@YK)PB)eEJZK)Cbe0%Zkb(n!EOKVdH zqr;(Z%;0^_C1NU-q(&c#Bx^8B4lcT!qfkuIxu{m!c{!>@eT=@gb42@oU Qb^cv}OiwoI3-%sDT+0kikN^Mx diff --git a/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 b/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 deleted file mode 100644 index 7a7fe2249..000000000 --- a/test/integration/stash/expected/.git_keep/objects/85/d387b0ab853a34de01344e8ca614fe8ea58318 +++ /dev/null @@ -1 +0,0 @@ -xjA ESWi^KZ5 s9]{% Wq"۱z Bř.%6r!`d͖EH5<9' 'ϊ(՛4ٴ!ѮPf36>&Rg|gx;+qN""NG '>]OX{ כ?XP \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 b/test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 new file mode 100644 index 0000000000000000000000000000000000000000..0cdd88ea01086a9f483371d5a3ed867a033a7df4 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b b/test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b new file mode 100644 index 0000000000000000000000000000000000000000..9dcd075d6e7cddcfdb4fbf70e13e4b441151aa9a GIT binary patch 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# literal 0 HcmV?d00001 diff --git a/test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff b/test/integration/stash/expected/.git_keep/objects/df/8cbdc0e9dca87b81e783ac7d814ac6d2a9c7ff deleted file mode 100644 index 341ebdd367d4ff806a4caf207635c3793a043253..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPOY@h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;>0_z YgD_o%nax?xNyneulw}2*1KNKp=5f$GYXATM diff --git a/test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 b/test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 new file mode 100644 index 0000000000000000000000000000000000000000..f57ce417b7d66e70e33708d0443088b0af141a69 GIT binary patch literal 184 zcmV;p07w6L0gcZ+YD6&%1mM)~6z&&-e^)>=>j(TABmo1G4QcN>{8pc2HKsdAbXZ%RwR=|X^4OZQcXIfh_!a1$W+Ab 1643011799 +1100 commit (initial): file0 +c00c9eb1ae239494475772c3f3dbae5ea4169575 7605fecac5dee01fb9df55ca984dcc7a72810f48 CI 1643011799 +1100 commit: file1 +7605fecac5dee01fb9df55ca984dcc7a72810f48 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011799 +1100 commit: file2 +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011803 +1100 reset: moving to HEAD +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011803 +1100 reset: moving to HEAD +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011806 +1100 reset: moving to HEAD +d22496528fe3c076a668c496ae7ba1f8136f1614 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011806 +1100 reset: moving to HEAD diff --git a/test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master b/test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..62c5e5c79 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 c00c9eb1ae239494475772c3f3dbae5ea4169575 CI 1643011799 +1100 commit (initial): file0 +c00c9eb1ae239494475772c3f3dbae5ea4169575 7605fecac5dee01fb9df55ca984dcc7a72810f48 CI 1643011799 +1100 commit: file1 +7605fecac5dee01fb9df55ca984dcc7a72810f48 d22496528fe3c076a668c496ae7ba1f8136f1614 CI 1643011799 +1100 commit: file2 diff --git a/test/integration/stashDrop/expected/.git_keep/logs/refs/stash b/test/integration/stashDrop/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..0b47b5c2e --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f4f81b6542e98a2f80269449674b0f8f454b74b0 CI 1643011806 +1100 On master: dsa diff --git a/test/integration/stashFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/stashDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/stashFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashDrop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/stashDrop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b b/test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b new file mode 100644 index 0000000000000000000000000000000000000000..24145cefe5d6422d1facb2ae6de393c5d5041043 GIT binary patch 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(My6eqLiZ3KGpb7UCism2h7HexU|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){ literal 0 HcmV?d00001 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 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/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 @@ -0,0 +1,3 @@ +x+)JMUd040031QHI5`ֶww.hT[H + e"ǨS,gu"YH +$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 b/test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 new file mode 100644 index 0000000000000000000000000000000000000000..6d84f0e3f6edb602eba4d7de82799c5b426e909b GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 b/test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 new file mode 100644 index 0000000000000000000000000000000000000000..782d5f0ee75e11eb8535d556b55865b2d66a72b1 GIT binary patch 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*yvn27HexU|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 literal 0 HcmV?d00001 diff --git a/test/integration/stashFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/stashDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac b/test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac new file mode 100644 index 0000000000000000000000000000000000000000..20498e40d227b9506ac3b8173c7e3f2b55721dee GIT binary patch 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/stashFiles/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashDrop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a rename to test/integration/stashDrop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a diff --git a/test/integration/stashFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashDrop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/stashFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/stashDrop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 b/test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 new file mode 100644 index 000000000..ce64e7f52 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 @@ -0,0 +1,3 @@ +x1 +0 @>B8BC%\#tV<})gEpg=ɝ-0V: \ No newline at end of file diff --git a/test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b b/test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b new file mode 100644 index 0000000000000000000000000000000000000000..57420d0275bc06c633987c2b5497508b4547435c GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 b/test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 new file mode 100644 index 0000000000000000000000000000000000000000..0c09e49d2b855ad1cedc66bdb2e40a7659d4398c GIT binary patch literal 182 zcmV;n07?IN0gcbWN(3Zo$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 literal 0 HcmV?d00001 diff --git a/test/integration/stashDrop/expected/.git_keep/refs/heads/master b/test/integration/stashDrop/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..0a7c9cc2b --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +d22496528fe3c076a668c496ae7ba1f8136f1614 diff --git a/test/integration/stashDrop/expected/.git_keep/refs/stash b/test/integration/stashDrop/expected/.git_keep/refs/stash new file mode 100644 index 000000000..0a4ae7ab5 --- /dev/null +++ b/test/integration/stashDrop/expected/.git_keep/refs/stash @@ -0,0 +1 @@ +f4f81b6542e98a2f80269449674b0f8f454b74b0 diff --git a/test/integration/stashFiles/expected/file0 b/test/integration/stashDrop/expected/file0 similarity index 100% rename from test/integration/stashFiles/expected/file0 rename to test/integration/stashDrop/expected/file0 diff --git a/test/integration/stashDrop/expected/file1 b/test/integration/stashDrop/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/stashDrop/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/stashFiles/expected/file2 b/test/integration/stashDrop/expected/file2 similarity index 100% rename from test/integration/stashFiles/expected/file2 rename to test/integration/stashDrop/expected/file2 diff --git a/test/integration/stashDrop/recording.json b/test/integration/stashDrop/recording.json new file mode 100644 index 000000000..c61c97b24 --- /dev/null +++ b/test/integration/stashDrop/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1329,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2003,"Mod":0,"Key":256,"Ch":83},{"Timestamp":2466,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2754,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2979,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3051,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3081,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3386,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3961,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4186,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4906,"Mod":0,"Key":256,"Ch":83},{"Timestamp":5394,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5626,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6002,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6066,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6113,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6378,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6842,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7074,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7315,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7714,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8114,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8546,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9379,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashFiles/setup.sh b/test/integration/stashDrop/setup.sh similarity index 100% rename from test/integration/stashFiles/setup.sh rename to test/integration/stashDrop/setup.sh diff --git a/test/integration/stashDrop/test.json b/test/integration/stashDrop/test.json new file mode 100644 index 000000000..7cb436f8f --- /dev/null +++ b/test/integration/stashDrop/test.json @@ -0,0 +1,4 @@ +{ + "description": "Stashing some files", + "speed": 20 +} diff --git a/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD b/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 52c8d5849..000000000 --- a/test/integration/stashFiles/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 diff --git a/test/integration/stashFiles/expected/.git_keep/index b/test/integration/stashFiles/expected/.git_keep/index deleted file mode 100644 index 5f67258e95d973701e47af05284f9b71673aa0fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmZ?q402{*U|<4bmW1qsjmnp*=D}!2pctF(fv*eI+0H4EQmRVaC5Xg6H`IvfM}>W5yYEggfM4?z8%;cAPqGqns{@J!RCYnxw--w gYz(@F3I<$}M~~^aY=7sk$5VZ#LNr_G;8A@p0L)Zq@&Et; diff --git a/test/integration/stashFiles/expected/.git_keep/logs/HEAD b/test/integration/stashFiles/expected/.git_keep/logs/HEAD deleted file mode 100644 index b5128c522..000000000 --- a/test/integration/stashFiles/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 5e1c4f2926fa291fbd2f95095429c75bc1148693 CI 1617674625 +1000 commit (initial): file0 -5e1c4f2926fa291fbd2f95095429c75bc1148693 143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 CI 1617674625 +1000 commit: file1 -143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674625 +1000 commit: file2 -ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674628 +1000 reset: moving to HEAD diff --git a/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master b/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 93b075067..000000000 --- a/test/integration/stashFiles/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 5e1c4f2926fa291fbd2f95095429c75bc1148693 CI 1617674625 +1000 commit (initial): file0 -5e1c4f2926fa291fbd2f95095429c75bc1148693 143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 CI 1617674625 +1000 commit: file1 -143b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 CI 1617674625 +1000 commit: file2 diff --git a/test/integration/stashFiles/expected/.git_keep/logs/refs/stash b/test/integration/stashFiles/expected/.git_keep/logs/refs/stash deleted file mode 100644 index af582ad3d..000000000 --- a/test/integration/stashFiles/expected/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 6ca18002905d50a6a77808f8b7d50839f68da7b7 CI 1617674628 +1000 On master: asd diff --git a/test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 b/test/integration/stashFiles/expected/.git_keep/objects/14/3b5c7bcd4b9a7fe84a66eed94ed680660bcfb2 deleted file mode 100644 index d3160cfeecef4d917f783228d12b7c2b9035f143..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@MfQSZCdtGB5uvLdV>+2&!P-(Hczk;Vx1YE8x-QGy zJusg7Zsuz!q{^y+MMbbiYLgb>+-fw8ff6T5;5OOq-F-ID)R2*yAVZrfHqL=_Le`Qe z1xQ!o=;YI%>+Xlq--hvFUs<-7U36XU9taARM40^7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h rTSy8F8IB*nWs~wE$Ee^_@+{%XXLTZ-(pg9fj0h<(#;O1SVZb>0{5mDa diff --git a/test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 b/test/integration/stashFiles/expected/.git_keep/objects/5e/1c4f2926fa291fbd2f95095429c75bc1148693 deleted file mode 100644 index 6ff9310ea046df3b87b97f7f1b8e1efb375f584c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPOY@h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;>0_z Y&JJ`HW;SO%CmnxsQϗ?~"DžĘ!}b?u ]zJ \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac b/test/integration/stashFiles/expected/.git_keep/objects/bf/b00d33696a9cadeeb1dfbe2a9f335f8c821fac deleted file mode 100644 index 2aab99cd868a22be74274c12bdde322e5b190b87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0gaA93c@fD06pgwdlzK0Nt3LI2%db#nryIO+EOFv^}^M{}X=h9gO57e': \ No newline at end of file diff --git a/test/integration/stashFiles/expected/.git_keep/refs/heads/master b/test/integration/stashFiles/expected/.git_keep/refs/heads/master deleted file mode 100644 index 52c8d5849..000000000 --- a/test/integration/stashFiles/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -ee9c2e33476df0ea209b0458006d8f6a0f03d2a1 diff --git a/test/integration/stashFiles/expected/.git_keep/refs/stash b/test/integration/stashFiles/expected/.git_keep/refs/stash deleted file mode 100644 index 4b3a3a692..000000000 --- a/test/integration/stashFiles/expected/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -6ca18002905d50a6a77808f8b7d50839f68da7b7 diff --git a/test/integration/stashFiles/recording.json b/test/integration/stashFiles/recording.json deleted file mode 100644 index e1b1132ad..000000000 --- a/test/integration/stashFiles/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1237,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1677,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1925,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1965,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2053,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2365,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2709,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2941,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3172,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3629,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3973,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4237,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4325,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4477,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4701,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5157,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5957,"Mod":2,"Key":16,"Ch":16},{"Timestamp":6725,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6997,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7613,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashNewBranch/expected/.git_keep/index b/test/integration/stashNewBranch/expected/.git_keep/index index f73149efa0501439043435eee3dda106c7fc2af4..7d5c3c25baaa4b90cd534d245d4752a863d3aa6d 100644 GIT binary patch delta 152 zcmaFJ^pHu##WTp6fq{Vuh*=VEu$me6uF-+fj0_B{jNb&+C#o1ofW`XvUxCq3IgN=q zP`QamBf)Y&8Y-tbF-L3SJvNBe$!A%?(m)z2tu^sapvb#f>{`Dn=epc@YqQ~UYhn4_ H{q}_b?dUXp delta 152 zcmaFJ^pHu##WTp6fq{Vuh*=V{56SC$McKhwmqw I)Rq4&0588a=>Px# diff --git a/test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stashPop/expected/.git_keep/FETCH_HEAD b/test/integration/stashPop/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stashPop/expected/.git_keep/HEAD b/test/integration/stashPop/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stashPop/expected/.git_keep/ORIG_HEAD b/test/integration/stashPop/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..8e8f6abd0 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +8634432ef171aa4b8d8e688fc1e5645245bf36ac diff --git a/test/integration/stashPop/expected/.git_keep/config b/test/integration/stashPop/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stashPop/expected/.git_keep/description b/test/integration/stashPop/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stashPop/expected/.git_keep/index b/test/integration/stashPop/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..1c25c6cf67833025f6f6363320d79391c166569b GIT binary patch literal 281 zcmZ?q402{*U|<4b=EQgLqKbcoZ-HoqNxcP(3=FJHO6=|o42??|7#P0-)rbHwn}vwg zl?DH_w!I5J^uBZH%}0Bun%-hyP0P$lH2_NE10Zt{VCkO6e^pa&e2EB+;>mZq5a89) zeHCJkAy^T}9V&Nou7GIex;68l?(sr*j|9&TqXwmY=U%Q_6kgTe@=ANYg*wC>Bd|Fk zL9VVqh9rZrf&tgOj^(^3Zs=ZGzyB&@+53uz9m;!j`aT4_Hk5t3K8!)nWzqi4t9FTH G1^@uhds7hr literal 0 HcmV?d00001 diff --git a/test/integration/stashPop/expected/.git_keep/info/exclude b/test/integration/stashPop/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/stashPop/expected/.git_keep/logs/HEAD b/test/integration/stashPop/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..36f584bdf --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 8b081dcb0e1fd5e9862d1aa6891b805b101abe7b CI 1643011851 +1100 commit (initial): file0 +8b081dcb0e1fd5e9862d1aa6891b805b101abe7b 3ae4e5d4920afbb1bac23426afb237524c8dbe41 CI 1643011851 +1100 commit: file1 +3ae4e5d4920afbb1bac23426afb237524c8dbe41 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011852 +1100 commit: file2 +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011854 +1100 reset: moving to HEAD +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011854 +1100 reset: moving to HEAD +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011856 +1100 reset: moving to HEAD +8634432ef171aa4b8d8e688fc1e5645245bf36ac 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011856 +1100 reset: moving to HEAD diff --git a/test/integration/stashPop/expected/.git_keep/logs/refs/heads/master b/test/integration/stashPop/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..5493552ad --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 8b081dcb0e1fd5e9862d1aa6891b805b101abe7b CI 1643011851 +1100 commit (initial): file0 +8b081dcb0e1fd5e9862d1aa6891b805b101abe7b 3ae4e5d4920afbb1bac23426afb237524c8dbe41 CI 1643011851 +1100 commit: file1 +3ae4e5d4920afbb1bac23426afb237524c8dbe41 8634432ef171aa4b8d8e688fc1e5645245bf36ac CI 1643011852 +1100 commit: file2 diff --git a/test/integration/stashPop/expected/.git_keep/logs/refs/stash b/test/integration/stashPop/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..4a66ec164 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 437b9b0ca941f1e12c8b45958f5d6ebd11cdd41a CI 1643011856 +1100 On master: asd diff --git a/test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 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/stashPop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashPop/expected/.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/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 b/test/integration/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 new file mode 100644 index 0000000000000000000000000000000000000000..aa0e72eedb74303642738f701260783ffb6a526c GIT binary patch literal 147 zcmV;E0Brww0gcX03c@fDKw;N8MfQTsc2wn9UlgR`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/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashPop/expected/.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/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 @@ -0,0 +1,3 @@ +x+)JMUd040031QHI5`ֶww.hT[H + e"ǨS,gu"YH +$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 b/test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 new file mode 100644 index 0000000000000000000000000000000000000000..1794b8694a817d214fc02c1d5a9c2edc27275c7c GIT binary patch literal 161 zcmV;S0ABxi0gaA93c@fD06pgwdlw{|Znmq42%db#Cf#7cw53My`S#-7>o5b8=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 literal 0 HcmV?d00001 diff --git a/test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac b/test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac new file mode 100644 index 0000000000000000000000000000000000000000..24d309c9e22283e00444c6d7cba25ab5b777b465 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b b/test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b new file mode 100644 index 0000000000000000000000000000000000000000..e730193f1096a737bc98278885356899d5a37c4b GIT binary patch literal 118 zcmV-+0Ez#20gcT;3WG2ZM&Yh=irE*+OdO+uQVOm-Mq>U@!H^;;cziuVw~r6rQcGDI ziR!KG00}y{A$spqlzwm_3BY5_n%Tybt%rJ5Yr?O6>Q2*4&uM<+2<5xsvDES+aoVxS Y*bCi7n9WtMNyDGqV!Z literal 0 HcmV?d00001 diff --git a/test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 b/test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 new file mode 100644 index 0000000000000000000000000000000000000000..4541e3cc903ca4b278638483bf5d52842ef6e4ca GIT binary patch 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)=F1`6^?^M%U zND2%YmhO4{S2gvSTj#0s<=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e b/test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e new file mode 100644 index 0000000000000000000000000000000000000000..8ebf85670da8fb2010e03ed16d2ca9dd0ae10270 GIT binary patch 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/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashPop/expected/.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/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c b/test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c new file mode 100644 index 0000000000000000000000000000000000000000..026ea2da19fad2fe2217aa5edb029d408feebac3 GIT binary patch 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# file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "hello there" > file1 +echo "hello there" > file2 +echo "hello there" > file3 diff --git a/test/integration/stashPop/test.json b/test/integration/stashPop/test.json new file mode 100644 index 000000000..7cb436f8f --- /dev/null +++ b/test/integration/stashPop/test.json @@ -0,0 +1,4 @@ +{ + "description": "Stashing some files", + "speed": 20 +} diff --git a/test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/stash_Copy/expected/.git_keep/FETCH_HEAD b/test/integration/stash_Copy/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/stash_Copy/expected/.git_keep/HEAD b/test/integration/stash_Copy/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD b/test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..78e4eb58e --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +f348ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash_Copy/expected/.git_keep/config b/test/integration/stash_Copy/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/stash_Copy/expected/.git_keep/description b/test/integration/stash_Copy/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/stash_Copy/expected/.git_keep/index b/test/integration/stash_Copy/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..daebfa4ef6fda597412bbd7efb7150e89f3eec9d GIT binary patch literal 281 zcmZ?q402{*U|<4b=EQfgZ^R^T*Mn%075AnwGBB_*DgI7jU}#*zz`*zws73^c*(^k? zt}OVcwe4N-q4%9jZ$8>P)$|qvYg%SbssT_M9{`zy0895g{;QgL<4Z(n6i>d>g#fRX z?yC@U48e*(?vVJ}*bbt_CvN@$bx#_)dn9;%7&R#EJNI(cqVTHzmRH*IEz}|A7=g_R z337D>G9(#{6%4rMbu8ySaYOgg`u$fK%idQ!>`>mLIW7 Gp8^2b0a`u) literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/info/exclude b/test/integration/stash_Copy/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/HEAD b/test/integration/stash_Copy/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..f95cf06ac --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011556 +1100 reset: moving to HEAD +f348ff60bdbb3695f2f519db6bc115b1b8d50886 f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011558 +1100 reset: moving to HEAD diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master b/test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..d1bf421f8 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b CI 1643011553 +1100 commit (initial): file0 +a7dde526f2e93ffa08897fbfca2c98ce40a8fa5b 4cc838ea1466afc5be1d3bc3e7a937641ec84d7d CI 1643011553 +1100 commit: file1 +4cc838ea1466afc5be1d3bc3e7a937641ec84d7d f348ff60bdbb3695f2f519db6bc115b1b8d50886 CI 1643011553 +1100 commit: file2 diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/refs/stash b/test/integration/stash_Copy/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..3f07cf22e --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/logs/refs/stash @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 CI 1643011556 +1100 On master: asd +e09b4dfcd66bfa1c81feeaf67e04d55368a2b065 2efac8148440778cbddcd80ac7477981277dcffe CI 1643011558 +1100 On master: asd diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 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/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc b/test/integration/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc new file mode 100644 index 0000000000000000000000000000000000000000..aab767a086e05e43391e8ca7089f727787fcb744 GIT binary patch literal 161 zcmV;S0ABxi0gaA93c@fD06pgwdlw{|WVc%p5qjz~vQ2^o(@Krt^X%NdBtxzH(lNl3_Kx$A9W4x++AqYt4gEan-vyfi32NGWVJse10IxI)+`Wt|X7 zQ6-TTVH4l&zHTs#a2dv1{>1ux|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a b/test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a new file mode 100644 index 0000000000000000000000000000000000000000..1b8805172a383685de99180dfbc10a7b583a5a5f GIT binary patch literal 162 zcmV;T0A2rh0gaA93c@fD06pgwdlw{WlkG-Cgr540Y?8%-X-kdJ=bMXnufq&XTuYfN zbY?i!J!e22OCqQ_G56@5bmELpj2w+| zY?zYMM5w~2KGz+_32x)`$VVvKD_`PT?qJaNy4eolY>d{b(Kc1{pSqftln+=JDB<0z Q>+cF=e&tSm0rw7HexU|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){ literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 new file mode 100644 index 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/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 new file mode 100644 index 000000000..c84b87a17 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 @@ -0,0 +1,3 @@ +x+)JMUd040031QHI5`ֶww.hT[H + e"ǨS,gu"YH +$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 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/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c new file mode 100644 index 0000000000000000000000000000000000000000..539f9791905e17d0a85ce5884381ce25c523a355 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 b/test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 new file mode 100644 index 0000000000000000000000000000000000000000..0cdd88ea01086a9f483371d5a3ed867a033a7df4 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b b/test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b new file mode 100644 index 0000000000000000000000000000000000000000..9dcd075d6e7cddcfdb4fbf70e13e4b441151aa9a GIT binary patch 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# literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a new file mode 100644 index 0000000000000000000000000000000000000000..ee4385f12cb5e2fea6044749c3960a2c40be7b9e GIT binary patch literal 28 kcmb4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* literal 0 HcmV?d00001 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 b/test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 new file mode 100644 index 0000000000000000000000000000000000000000..f57ce417b7d66e70e33708d0443088b0af141a69 GIT binary patch literal 184 zcmV;p07w6L0gcZ+YD6&%1mM)~6z&&-e^)>=>j(TABmo1G4QcN>{8pc2HKsdAbX file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "hello there" > file1 +echo "hello there" > file2 +echo "hello there" > file3 diff --git a/test/integration/stashFiles/test.json b/test/integration/stash_Copy/test.json similarity index 100% rename from test/integration/stashFiles/test.json rename to test/integration/stash_Copy/test.json