Fix stashing all staged

files 2.txt

@@ -0,0 +1 @@
+some text

files.txt

@@ -0,0 +1 @@
+some text

pkg/gui/controllers/files_controller.go

@@ -797,7 +797,11 @@ func (self *FilesController) createStashMenu() error {
 					if !self.c.Helpers().WorkingTree.AnyStagedFiles() {
 						return errors.New(self.c.Tr.NoTrackedStagedFilesStash)
 					}
-					return self.handleStashSave(self.c.Git().Stash.SaveStagedChanges, self.c.Tr.Actions.StashStagedChanges)
+					if self.c.Helpers().WorkingTree.AnyUnstagedFiles() {
+						return self.handleStashSave(self.c.Git().Stash.SaveStagedChanges, self.c.Tr.Actions.StashStagedChanges)
+					}
+					// ordinary stash
+					return self.handleStashSave(self.c.Git().Stash.Push, self.c.Tr.Actions.StashUnstagedChanges)
 				},
 				Key: 's',
 			},

pkg/gui/controllers/helpers/working_tree_helper.go

@@ -48,6 +48,15 @@ func (self *WorkingTreeHelper) AnyStagedFiles() bool {
 	return false
 }
 
+func (self *WorkingTreeHelper) AnyUnstagedFiles() bool {
+	for _, file := range self.c.Model().Files {
+		if file.HasUnstagedChanges {
+			return true
+		}
+	}
+	return false
+}
+
 func (self *WorkingTreeHelper) AnyTrackedFiles() bool {
 	for _, file := range self.c.Model().Files {
 		if file.Tracked {

pkg/integration/tests/stash/stash_staged_all.go

@@ -0,0 +1,50 @@
+package stash
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var StashStagedAll = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Stash staged (all files and content) changes",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("file-staged", "content")
+		shell.EmptyCommit("initial commit")
+		shell.UpdateFileAndAdd("file-staged", "more content")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Stash().
+			IsEmpty()
+
+		t.Views().Files().
+			Lines(
+				Contains("file-staged"),
+			).
+			Press(keys.Files.ViewStashOptions)
+
+		t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("Stash staged changes$")).Confirm()
+
+		// in the previous implementation if you give a name to the stash entry it whould work
+		// that's why here I'm specifically not giving one
+		t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("").Confirm()
+
+		t.Views().Stash().
+			LineCount(EqualsInt(1)).    // I check that there's only one line here
+			Lines(MatchesRegexp("WIP")) // I didn't specify the file so cannot check the content.
+
+		t.Views().Files().IsEmpty()
+
+		t.Views().Stash().
+			Focus().
+			PressEnter()
+
+		t.Views().CommitFiles().
+			IsFocused().
+			Lines(
+				Contains("file-staged").IsSelected(),
+			)
+	},
+})

pkg/integration/tests/stash/stash_staged.go → pkg/integration/tests/stash/stash_staged_partial.go

@@ -5,8 +5,8 @@ import (
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )
 
-var StashStaged = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Stash staged changes",
+var StashStagedPartial = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Stash some (but not all) staged changes",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig:  func(config *config.AppConfig) {},

pkg/integration/tests/test_list.go

@@ -256,7 +256,8 @@ var tests = []*components.IntegrationTest{
 	stash.StashAll,
 	stash.StashAndKeepIndex,
 	stash.StashIncludingUntrackedFiles,
-	stash.StashStaged,
+	stash.StashStagedAll,
+	stash.StashStagedPartial,
 	stash.StashUnstaged,
 	status.ClickRepoNameToOpenReposMenu,
 	status.ClickToFocus,