fix bug where mixed reset is actually a soft reset

2 files changed, 10 insertions, 0 deletions

diff --git a/pkg/commands/branches.go b/pkg/commands/branches.go
index cfc9803d6..62a243247 100644
--- a/pkg/commands/branches.go
+++ b/pkg/commands/branches.go
@@ -152,6 +152,10 @@ func (c *GitCommand) ResetSoft(ref string) error {
 	return c.RunCommand("git reset --soft " + ref)
 }
 
+func (c *GitCommand) ResetMixed(ref string) error {
+	return c.RunCommand("git reset --mixed " + ref)
+}
+
 func (c *GitCommand) RenameBranch(oldName string, newName string) error {
 	return c.RunCommand("git branch --move %s %s", oldName, newName)
 }
diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 2745c1935..db5585172 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -87,7 +87,13 @@ func (c *GitCommand) WithSpan(span string) *GitCommand {
 	newGitCommand := &GitCommand{}
 	*newGitCommand = *c
 	newGitCommand.OSCommand = c.OSCommand.WithSpan(span)
+
+	// NOTE: unlike the other things here which create shallow clones, this will
+	// actually update the PatchManager on the original struct to have the new span.
+	// This means each time we call ApplyPatch in PatchManager, we need to ensure
+	// we've called .WithSpan() ahead of time with the new span value
 	newGitCommand.PatchManager.ApplyPatch = newGitCommand.ApplyPatch
+
 	return newGitCommand
 }