mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace uses of "git stash save" with "git stash push"

Browse source 
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.
This commit is contained in:
Stefan Haller 2023-07-01 16:22:32 +02:00
parent 1827380c69
commit 30ce7c8085
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkg/commands/git_commands/stash.go
View file

@ -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()
}