autostash changes when pulling file into index

1 files changed, 21 insertions, 5 deletions

diff --git a/pkg/commands/patch_rebases.go b/pkg/commands/patch_rebases.go
index 19116e071..eeeb0876c 100644
--- a/pkg/commands/patch_rebases.go
+++ b/pkg/commands/patch_rebases.go
@@ -131,14 +131,22 @@ func (c *GitCommand) MovePatchToSelectedCommit(commits []*Commit, sourceCommitId
 	return c.GenericMerge("rebase", "continue")
 }
 
-func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *PatchManager) error {
+func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *PatchManager, stash bool) error {
+	if stash {
+		if err := c.StashSave(c.Tr.SLocalize("StashPrefix") + commits[commitIdx].Sha); err != nil {
+			return err
+		}
+	}
+
 	if err := c.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil {
 		return err
 	}
 
 	if err := p.ApplyPatches(true); err != nil {
-		if err := c.GenericMerge("rebase", "abort"); err != nil {
-			return err
+		if c.WorkingTreeState() == "rebasing" {
+			if err := c.GenericMerge("rebase", "abort"); err != nil {
+				return err
+			}
 		}
 		return err
 	}
@@ -155,12 +163,20 @@ func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *Pat
 	c.onSuccessfulContinue = func() error {
 		// add patches to index
 		if err := p.ApplyPatches(false); err != nil {
-			if err := c.GenericMerge("rebase", "abort"); err != nil {
-				return err
+			if c.WorkingTreeState() == "rebasing" {
+				if err := c.GenericMerge("rebase", "abort"); err != nil {
+					return err
+				}
 			}
 			return err
 		}
 
+		if stash {
+			if err := c.StashDo(0, "apply"); err != nil {
+				return err
+			}
+		}
+
 		c.PatchManager.Reset()
 		return nil
 	}