Merge pull request #3 from UnseenBook/reset_fix_skip_worktreereset_when_removedfiles_is_empty

fix: when removedFiles is empty when MergeResetting, skip worktreereset

Author: k-anshul

worktree.go

@@ -316,12 +316,18 @@ func (w *Worktree) ResetSparsely(opts *ResetOptions, dirs []string) error {
 		}
 	}
 
-	if opts.Mode == MergeReset || opts.Mode == HardReset {
+	if opts.Mode == MergeReset && len(removedFiles) > 0 {
 		if err := w.resetWorktree(t, removedFiles); err != nil {
 			return err
 		}
 	}
 
+	if opts.Mode == HardReset {
+		if err := w.resetWorktree(t, opts.Files); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }