diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-11-14 18:17:54 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 18:17:54 +1100 |
| commit | fbfec75a996ee5a0190629d8b43cf299bb31c260 (patch) | |
| tree | d2706dc236491f7839ff5119e4eb60409e5bdbd8 /pkg/commands/git_commands/stash.go | |
| parent | f67824b349fdbdcd1779e260f80bd26a446a4702 (diff) | |
| parent | 3e73dacce3365b540b278c3e1afb9bd8059d1ce7 (diff) | |
Merge pull request #2261 from sudoburt/merge-loaders-git-commands
Diffstat (limited to 'pkg/commands/git_commands/stash.go')
| -rw-r--r-- | pkg/commands/git_commands/stash.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/commands/git_commands/stash.go b/pkg/commands/git_commands/stash.go index 9c7321b50..eddf676ff 100644 --- a/pkg/commands/git_commands/stash.go +++ b/pkg/commands/git_commands/stash.go @@ -4,19 +4,18 @@ import ( "fmt" "strings" - "github.com/jesseduffield/lazygit/pkg/commands/loaders" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" ) type StashCommands struct { *GitCommon - fileLoader *loaders.FileLoader + fileLoader *FileLoader workingTree *WorkingTreeCommands } func NewStashCommands( gitCommon *GitCommon, - fileLoader *loaders.FileLoader, + fileLoader *FileLoader, workingTree *WorkingTreeCommands, ) *StashCommands { return &StashCommands{ @@ -111,7 +110,7 @@ func (self *StashCommands) SaveStagedChanges(message string) error { // meaning it's deleted in your working tree but added in your index. Given that it's // now safely stashed, we need to remove it. files := self.fileLoader. - GetStatusFiles(loaders.GetStatusFileOptions{}) + GetStatusFiles(GetStatusFileOptions{}) for _, file := range files { if file.ShortStatus == "AD" { |