diff options
author | Luka Markušić <luka.markusic@microblink.com> | 2022-05-06 12:03:18 +0200 |
---|---|---|
committer | Luka Markušić <luka.markusic@microblink.com> | 2022-05-06 12:03:18 +0200 |
commit | 8b8a405b7c9765d8e679e1376539041eb6cc0957 (patch) | |
tree | 0f56b66bf3e2ca7e0da273b302af9353e18264c6 /test | |
parent | eb038d1950909f666ff2262f83f66e5b26bf1e71 (diff) |
Update stashing tests to apply instead of pop
Diffstat (limited to 'test')
84 files changed, 86 insertions, 60 deletions
diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD index edd32295e..b6b4a34f7 100644 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -8fa874178500f99d69f649ff9128f3d1b62369a0 +cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/index b/test/integration/stashAllChanges/expected/repo/.git_keep/index Binary files differindex afb46a953..1d75c1b32 100644 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/index +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/index diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD index c920669ff..f29e0fda8 100644 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 CI <CI@example.com> 1650002283 +0200 commit (initial): file0 -29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 624317ac2731648d4b0e30068dd35aca2a0b4791 CI <CI@example.com> 1650002283 +0200 commit: file1 -624317ac2731648d4b0e30068dd35aca2a0b4791 8fa874178500f99d69f649ff9128f3d1b62369a0 CI <CI@example.com> 1650002283 +0200 commit: file2 -8fa874178500f99d69f649ff9128f3d1b62369a0 8fa874178500f99d69f649ff9128f3d1b62369a0 CI <CI@example.com> 1650002287 +0200 reset: moving to HEAD -8fa874178500f99d69f649ff9128f3d1b62369a0 8fa874178500f99d69f649ff9128f3d1b62369a0 CI <CI@example.com> 1650002295 +0200 reset: moving to HEAD -8fa874178500f99d69f649ff9128f3d1b62369a0 8fa874178500f99d69f649ff9128f3d1b62369a0 CI <CI@example.com> 1650002303 +0200 reset: moving to HEAD +0000000000000000000000000000000000000000 a52c63287cda99fcc917438c34ac8f9c67274d79 CI <CI@example.com> 1651830755 +0200 commit (initial): file0 +a52c63287cda99fcc917438c34ac8f9c67274d79 283a00085a0d95e814920f9eae7009789cee0eab CI <CI@example.com> 1651830755 +0200 commit: file1 +283a00085a0d95e814920f9eae7009789cee0eab cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830755 +0200 commit: file2 +cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830760 +0200 reset: moving to HEAD +cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830769 +0200 reset: moving to HEAD +cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830778 +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 index 89fb0a652..3b9c06579 100644 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 CI <CI@example.com> 1650002283 +0200 commit (initial): file0 -29e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 624317ac2731648d4b0e30068dd35aca2a0b4791 CI <CI@example.com> 1650002283 +0200 commit: file1 -624317ac2731648d4b0e30068dd35aca2a0b4791 8fa874178500f99d69f649ff9128f3d1b62369a0 CI <CI@example.com> 1650002283 +0200 commit: file2 +0000000000000000000000000000000000000000 a52c63287cda99fcc917438c34ac8f9c67274d79 CI <CI@example.com> 1651830755 +0200 commit (initial): file0 +a52c63287cda99fcc917438c34ac8f9c67274d79 283a00085a0d95e814920f9eae7009789cee0eab CI <CI@example.com> 1651830755 +0200 commit: file1 +283a00085a0d95e814920f9eae7009789cee0eab cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830755 +0200 commit: file2 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/stash new file mode 100644 index 000000000..a3a868578 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/stash @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 df9f3a300512205640e5ff10b624072a10afddde CI <CI@example.com> 1651830760 +0200 On master: stash all +df9f3a300512205640e5ff10b624072a10afddde 6b8c369acb1897a5787e72b4c15d597d346f2b6a CI <CI@example.com> 1651830769 +0200 On master: stash newly tracked +6b8c369acb1897a5787e72b4c15d597d346f2b6a 5a70ee314842fb5f46b452d16bc4d95e7154d4b4 CI <CI@example.com> 1651830778 +0200 On master: stash with staged diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/3a00085a0d95e814920f9eae7009789cee0eab b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/3a00085a0d95e814920f9eae7009789cee0eab new file mode 100644 index 000000000..45c762814 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/3a00085a0d95e814920f9eae7009789cee0eab @@ -0,0 +1,2 @@ +xK +0@]$ɀU1N&X0=xpOcWj1%f_CnAjPlstf]8yDHP$DH2zg<|/Y
\N)zkA-/u9
\ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 deleted file mode 100644 index efe9bb1f3..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/29/e5ddcfe80c21ef3d9df877d1173d8d1f56dce7 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0FsdR -<FbP")x|=BRKYY[O<Ƭ%,Uń_ԝwcE,2vtga6W&
r
lN+
\ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/6ddc4a6a06724993b2a55fec3f696c47b9dcce b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/6ddc4a6a06724993b2a55fec3f696c47b9dcce Binary files differnew file mode 100644 index 000000000..3aa0ef009 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/6ddc4a6a06724993b2a55fec3f696c47b9dcce diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5a/70ee314842fb5f46b452d16bc4d95e7154d4b4 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5a/70ee314842fb5f46b452d16bc4d95e7154d4b4 Binary files differnew file mode 100644 index 000000000..62afd0629 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5a/70ee314842fb5f46b452d16bc4d95e7154d4b4 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/62/4317ac2731648d4b0e30068dd35aca2a0b4791 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/62/4317ac2731648d4b0e30068dd35aca2a0b4791 Binary files differdeleted file mode 100644 index 0a30073de..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/62/4317ac2731648d4b0e30068dd35aca2a0b4791 +++ /dev/null diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/65/e3f346ea03c8c2b0f1b8f6691abaed651fb77d b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/65/e3f346ea03c8c2b0f1b8f6691abaed651fb77d new file mode 100644 index 000000000..2d46f6c29 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/65/e3f346ea03c8c2b0f1b8f6691abaed651fb77d @@ -0,0 +1,3 @@ +x +0E]+f/H("BWI2BӔo6TKhOmgNk#S$̈6Ā6OF;
RDtS*q8N*2Ya:LM>UwF*T +FzYj)E=s1+zwi^X/-6Av
\ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6b/8c369acb1897a5787e72b4c15d597d346f2b6a b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6b/8c369acb1897a5787e72b4c15d597d346f2b6a new file mode 100644 index 000000000..e0f637f62 --- /dev/null +++ b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6b/8c369acb1897a5787e72b4c15d597d346f2b6a @@ -0,0 +1,2 @@ +xJ1a$Jjf5+R0{莨oo6>~8>ax*IcK6(PQUH*/wu 1bbRhIZϾZ86*WL%7D\X+FJJuqv8_|yo>_NIHh1\牡 +Op>z1Q
\ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6c/09c8b498849a1679bcd05488661a2ce123b578 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6c/09c8b498849a1679bcd05488661a2ce123b578 deleted file mode 100644 index 9727c4ec6..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6c/09c8b498849a1679bcd05488661a2ce123b578 +++ /dev/null @@ -1,2 +0,0 @@ -xA - E/qQK)rbnXK
+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 deleted file mode 100644 index 1a811f4f1..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6e/fac41f92e54de5411b9195449dbef0960daaf4 +++ /dev/null @@ -1,3 +0,0 @@ -xϻJAay{F>CMw+L,3-vbnz.qBj,VEuAW$M|#ü<bRr\"1Ė1bĂUJEr65(F5|~ -oHlR:W2<C\:#/wrN -mMq
\ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/7f/e42e1229b06d1307f6e7717c47f6bb4248fa2e b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/7f/e42e1229b06d1307f6e7717c47f6bb4248fa2e deleted file mode 100644 index 0c987fc11..0 |