From 6feb301c2a3367698ccf5f1f3f8f3e89fe806604 Mon Sep 17 00:00:00 2001 From: Andrew Hynes Date: Tue, 21 Jun 2022 18:23:23 -0230 Subject: [PATCH] fix: use message in git stash command --- pkg/commands/git_commands/stash.go | 2 +- .../expected/repo/.git_keep/ORIG_HEAD | 2 +- .../expected/repo/.git_keep/logs/HEAD | 4 ++-- .../repo/.git_keep/logs/refs/heads/master | 2 +- .../expected/repo/.git_keep/logs/refs/stash | 2 +- .../02/8cf118f08271dc2b9dd68d72a65918df664951 | 2 -- .../03/158a5be423590fa91f97c23ed505745e8e8aff | Bin 0 -> 122 bytes .../29/b079ba8e40edf7b2c76613e0a3de5b1b26ce70 | 2 ++ .../59/2d439043d07cd223cbde4b3a0884b94634437b | Bin 123 -> 0 bytes .../b3/c24805b28fa5e90b5807bb402b123974f13d61 | Bin 219 -> 0 bytes .../db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935 | Bin 166 -> 0 bytes .../fe/d8896ec3398ae58cfd81e56a058bf18b49427a | 2 ++ .../ff/d4134b8bf80d379824558ce19b4eddbc53e2ba | Bin 0 -> 147 bytes .../expected/repo/.git_keep/refs/heads/master | 2 +- .../expected/repo/.git_keep/refs/stash | 2 +- .../stashIncludeUntrackedChanges/recording.json | 2 +- 16 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951 create mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/03/158a5be423590fa91f97c23ed505745e8e8aff create mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/29/b079ba8e40edf7b2c76613e0a3de5b1b26ce70 delete mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/59/2d439043d07cd223cbde4b3a0884b94634437b delete mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/b3/c24805b28fa5e90b5807bb402b123974f13d61 delete mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935 create mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/fe/d8896ec3398ae58cfd81e56a058bf18b49427a create mode 100644 test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/ff/d4134b8bf80d379824558ce19b4eddbc53e2ba diff --git a/pkg/commands/git_commands/stash.go b/pkg/commands/git_commands/stash.go index 255e7a86c..72b61b744 100644 --- a/pkg/commands/git_commands/stash.go +++ b/pkg/commands/git_commands/stash.go @@ -111,6 +111,6 @@ func (self *StashCommands) SaveStagedChanges(message string) error { } func (self *StashCommands) StashUntrackedChanges(message string) error { - return self.cmd.New("git stash --include-untracked").Run(); + return self.cmd.New(fmt.Sprintf("git stash save %s --include-untracked", self.cmd.Quote(message))).Run() } diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD index a3df47f69..a25b9571b 100644 --- a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -592d439043d07cd223cbde4b3a0884b94634437b +03158a5be423590fa91f97c23ed505745e8e8aff diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD index 8daa2233e..cd44a69c6 100644 --- a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD +++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 592d439043d07cd223cbde4b3a0884b94634437b CI 1654284027 -0230 commit (initial): Initial commit -592d439043d07cd223cbde4b3a0884b94634437b 592d439043d07cd223cbde4b3a0884b94634437b CI 1654284036 -0230 reset: moving to HEAD +0000000000000000000000000000000000000000 03158a5be423590fa91f97c23ed505745e8e8aff CI 1655844652 -0230 commit (initial): Initial commit +03158a5be423590fa91f97c23ed505745e8e8aff 03158a5be423590fa91f97c23ed505745e8e8aff CI 1655844659 -0230 reset: moving to HEAD diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master index 1074c856f..d99532170 100644 --- a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 592d439043d07cd223cbde4b3a0884b94634437b CI 1654284027 -0230 commit (initial): Initial commit +0000000000000000000000000000000000000000 03158a5be423590fa91f97c23ed505745e8e8aff CI 1655844652 -0230 commit (initial): Initial commit diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash index f33d8a619..2fa025e98 100644 --- a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash +++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash @@ -1 +1 @@ -0000000000000000000000000000000000000000 b3c24805b28fa5e90b5807bb402b123974f13d61 CI 1654284036 -0230 WIP on master: 592d439 Initial commit +0000000000000000000000000000000000000000 fed8896ec3398ae58cfd81e56a058bf18b49427a CI 1655844659 -0230 WIP on master: 03158a5 Initial commit diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951 deleted file mode 100644 index 4032664a3..000000000 --- a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951 +++ /dev/null @@ -1,2 +0,0 @@ -x[ -0E*fJ&&""HS 6)| n9R-%7@Ome:ץQoXdGt!("d;nqoϺB?=j:k7R;8K8ؗFzSy@_5`Xrq_Z|j: \ No newline at end of file diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/03/158a5be423590fa91f97c23ed505745e8e8aff b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/03/158a5be423590fa91f97c23ed505745e8e8aff new file mode 100644 index 0000000000000000000000000000000000000000..b4c7ec9be8564e3d6b59d0bf0c1b40525aeb724d GIT binary patch literal 122 zcmV-=0EPc}0ga783d0}}0DJZo`+<~=*;!%+~)AmZ>;Z4uesGbjKb`Q cge?qcCo~5=CSCv3O?Z`F;s$4Dett_YrD3T!n*aa+ literal 0 HcmV?d00001 diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/29/b079ba8e40edf7b2c76613e0a3de5b1b26ce70 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/29/b079ba8e40edf7b2c76613e0a3de5b1b26ce70 new file mode 100644 index 000000000..635f2cc2f --- /dev/null +++ b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/29/b079ba8e40edf7b2c76613e0a3de5b1b26ce70 @@ -0,0 +1,2 @@ +xA +0E]s%MgDDzI:BӔǷ >Xr*cOu -j! ɍRAQRA 9 hZ:oie$M8qw} n:%|9DKڴZ\M(;2a3|E \ No newline at end of file diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/59/2d439043d07cd223cbde4b3a0884b94634437b b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/59/2d439043d07cd223cbde4b3a0884b94634437b deleted file mode 100644 index d695a40a5970daf0eb6dc0bd12b6227ede70277b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmV->0EGW|0ga783c@fD06pgw`vGOU-NXb$gr4$@B;8`5F{P~F^DX!Rufq&edTUi- zu;WR05#a2}&c!j6>?DVT4#jd_{OkgGzhn^($R@q@*>{*C+@|=DPiosLm(trE24|T( dBVFN)G@?1^F;V$bH}O@qrWJmj`2u@vFPDNGJk*mR-2D!m1;%6zYB6K65tMUD zVx5^vPJ@2$pX(MbQ+T;dZ~mk6{pL??onJ%ZOdu4I!(#-D!$FVe-T$c%AJcnSmoV$s Vv3Wk5!?axYtKP!j-7oKQUWsDma!CLH diff --git a/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935 b/test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935 deleted file mode 100644 index b3d2804ffbf0463e12c63f6717af698829d11040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0gaA93c@fDMP26xqyZNhJrE1q^lkS=rj^bF)d9zzD>M<+n@K|PqmcX z0G&Ivl^LY(Y!^puoMEM+LDUY>daqK#6e%V{Q|u-Y_V%nR^aI@b;lZC!-ZNiPEq6dm z