git: worktree, Don't delete local untracked files when resetting worktree. Fixes go-git#53

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
 }
 
@@ -457,11 +463,6 @@ func (w *Worktree) resetWorktree(t *object.Tree, files []string) error {
 	}
 	b := newIndexBuilder(idx)
 
-	status, err := w.Status()
-	if err != nil {
-		return err
-	}
-
 	for _, ch := range changes {
 		if err := w.validChange(ch); err != nil {
 			return err
@@ -485,13 +486,8 @@ func (w *Worktree) resetWorktree(t *object.Tree, files []string) error {
 			}
 		}
 
-		// only checkout an untracked file if it is in the list of files
-		// a reset should leave untracked files alone
-		file := nameFromAction(&ch)
-		if status.File(file).Worktree != Untracked || inFiles(files, file) {
-			if err := w.checkoutChange(ch, t, b); err != nil {
-				return err
-			}
+		if err := w.checkoutChange(ch, t, b); err != nil {
+			return err
 		}
 	}
 

worktree_test.go

@@ -1149,7 +1149,7 @@ func (s *WorktreeSuite) TestResetWithUntracked() {
 			continue
 		}
 		if st.Worktree != Unmodified || st.Staging != Unmodified {
-			s.Fail("file %s not unmodified", file)
+			s.Failf("file %s not unmodified", file)
 		}
 	}
 }