Drop stash when successfully unstashing files after moving patch to index

Author: stefanhaller

pkg/commands/git_commands/patch.go

@@ -259,7 +259,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 		}
 
 		if stash {
-			if err := self.stash.Apply(0); err != nil {
+			if err := self.stash.Pop(0); err != nil {
 				return err
 			}
 		}

pkg/integration/tests/patch_building/move_to_index_with_modified_file.go

@@ -54,11 +54,6 @@ var MoveToIndexWithModifiedFile = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Secondary().
 			Content(Contains("-1\n+11\n"))
 
-		/* EXPECTED:
 		t.Views().Stash().IsEmpty()
-		ACTUAL: */
-		t.Views().Stash().Lines(
-			Contains("Auto-stashing changes"),
-		)
 	},
 })