From 30ce7c8085b0ca67d84451ad8607116c9e038fae Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sat, 1 Jul 2023 16:22:32 +0200 Subject: Replace uses of "git stash save" with "git stash push" Save has been deprecated for a while, push is the recommended way to save a stash. Push has been available since 2.13, so we can use it without problems. --- pkg/commands/git_commands/patch.go | 2 +- pkg/commands/git_commands/stash.go | 14 +++++++------- pkg/commands/git_commands/stash_test.go | 4 ++-- pkg/gui/controllers/files_controller.go | 6 +++--- pkg/gui/controllers/helpers/refs_helper.go | 2 +- pkg/gui/controllers/undo_controller.go | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'pkg') diff --git a/pkg/commands/git_commands/patch.go b/pkg/commands/git_commands/patch.go index 942785314..3159ff31d 100644 --- a/pkg/commands/git_commands/patch.go +++ b/pkg/commands/git_commands/patch.go @@ -221,7 +221,7 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitIdx int, stash bool) error { if stash { - if err := self.stash.Save(self.Tr.StashPrefix + commits[commitIdx].Sha); err != nil { + if err := self.stash.Push(self.Tr.StashPrefix + commits[commitIdx].Sha); err != nil { return err } } diff --git a/pkg/commands/git_commands/stash.go b/pkg/commands/git_commands/stash.go index a9e2d67e5..562e7b97d 100644 --- a/pkg/commands/git_commands/stash.go +++ b/pkg/commands/git_commands/stash.go @@ -52,9 +52,9 @@ func (self *StashCommands) Apply(index int) error { return self.cmd.New(cmdArgs).Run() } -// Save save stash -func (self *StashCommands) Save(message string) error { - cmdArgs := NewGitCmd("stash").Arg("save", message). +// Push push stash +func (self *StashCommands) Push(message string) error { + cmdArgs := NewGitCmd("stash").Arg("push", "-m", message). ToArgv() return self.cmd.New(cmdArgs).Run() @@ -94,7 +94,7 @@ func (self *StashCommands) ShowStashEntryCmdObj(index int, ignoreWhitespace bool } func (self *StashCommands) StashAndKeepIndex(message string) error { - cmdArgs := NewGitCmd("stash").Arg("save", "--keep-index", message). + cmdArgs := NewGitCmd("stash").Arg("push", "--keep-index", "-m", message). ToArgv() return self.cmd.New(cmdArgs).Run() @@ -108,7 +108,7 @@ func (self *StashCommands) StashUnstagedChanges(message string) error { ).Run(); err != nil { return err } - if err := self.Save(message); err != nil { + if err := self.Push(message); err != nil { return err } @@ -130,7 +130,7 @@ func (self *StashCommands) SaveStagedChanges(message string) error { return err } - if err := self.Save(message); err != nil { + if err := self.Push(message); err != nil { return err } @@ -172,7 +172,7 @@ func (self *StashCommands) SaveStagedChanges(message string) error { func (self *StashCommands) StashIncludeUntrackedChanges(message string) error { return self.cmd.New( - NewGitCmd("stash").Arg("save", "--include-untracked", message). + NewGitCmd("stash").Arg("push", "--include-untracked", "-m", message). ToArgv(), ).Run() } diff --git a/pkg/commands/git_commands/stash_test.go b/pkg/commands/git_commands/stash_test.go index f1a151cd8..1c8976c6d 100644 --- a/pkg/commands/git_commands/stash_test.go +++ b/pkg/commands/git_commands/stash_test.go @@ -37,10 +37,10 @@ func TestStashPop(t *testing.T) { func TestStashSave(t *testing.T) { runner := oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"stash", "save", "A stash message"}, "", nil) + ExpectGitArgs([]string{"stash", "push", "-m", "A stash message"}, "", nil) instance := buildStashCommands(commonDeps{runner: runner}) - assert.NoError(t, instance.Save("A stash message")) + assert.NoError(t, instance.Push("A stash message")) runner.CheckForMissingCalls() } diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 6d4647e01..1b5d44080 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -697,7 +697,7 @@ func (self *FilesController) createStashMenu() error { if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() { return self.c.ErrorMsg(self.c.Tr.NoFilesToStash) } - return self.handleStashSave(self.c.Git().Stash.Save, self.c.Tr.Actions.StashAllChanges) + return self.handleStashSave(self.c.Git().Stash.Push, self.c.Tr.Actions.StashAllChanges) }, Key: 'a', }, @@ -740,7 +740,7 @@ func (self *FilesController) createStashMenu() error { return self.handleStashSave(self.c.Git().Stash.StashUnstagedChanges, self.c.Tr.Actions.StashUnstagedChanges) } // ordinary stash - return self.handleStashSave(self.c.Git().Stash.Save, self.c.Tr.Actions.StashUnstagedChanges) + return self.handleStashSave(self.c.Git().Stash.Push, self.c.Tr.Actions.StashUnstagedChanges) }, Key: 'u', }, @@ -749,7 +749,7 @@ func (self *FilesController) createStashMenu() error { } func (self *FilesController) stash() error { - return self.handleStashSave(self.c.Git().Stash.Save, self.c.Tr.Actions.StashAllChanges) + return self.handleStashSave(self.c.Git().Stash.Push, self.c.Tr.Actions.StashAllChanges) } func (self *FilesController) createResetToUpstreamMenu() error { diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go index af3a0875f..3c96add84 100644 --- a/pkg/gui/controllers/helpers/refs_helper.go +++ b/pkg/gui/controllers/helpers/refs_helper.go @@ -65,7 +65,7 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions Title: self.c.Tr.AutoStashTitle, Prompt: self.c.Tr.AutoStashPrompt, HandleConfirm: func() error { - if err := self.c.Git().Stash.Save(self.c.Tr.StashPrefix + ref); err != nil { + if err := self.c.Git().Stash.Push(self.c.Tr.StashPrefix + ref); err != nil { return self.c.Error(err) } if err := self.c.Git().Branch.Checkout(ref, cmdOptions); err != nil { diff --git a/pkg/gui/controllers/undo_controller.go b/pkg/gui/controllers/undo_controller.go index 60eff1888..1546d0c46 100644 --- a/pkg/gui/controllers/undo_controller.go +++ b/pkg/gui/controllers/undo_controller.go @@ -249,7 +249,7 @@ func (self *UndoController) hardResetWithAutoStash(commitSha string, options har Prompt: self.c.Tr.AutoStashPrompt, HandleConfirm: func() error { return self.c.WithWaitingStatus(options.WaitingStatus, func(gocui.Task) error { - if err := self.c.Git().Stash.Save(self.c.Tr.StashPrefix + commitSha); err != nil { + if err := self.c.Git().Stash.Push(self.c.Tr.StashPrefix + commitSha); err != nil { return self.c.Error(err) } if err := reset(); err != nil { -- cgit v1.2.3