Merge pull request #499 from mcuadros/move-pull

move Repository.Pull to Worktree.Pull

1 files changed, 41 insertions, 0 deletions

diff --git a/worktree.go b/worktree.go
index 13b2497..0c15d4c 100644
--- a/worktree.go
+++ b/worktree.go
@@ -32,6 +32,47 @@ type Worktree struct {
 	fs billy.Filesystem
 }
 
+// Pull incorporates changes from a remote repository into the current branch.
+// Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are
+// no changes to be fetched, or an error.
+func (w *Worktree) Pull(o *PullOptions) error {
+	if err := o.Validate(); err != nil {
+		return err
+	}
+
+	head, err := w.r.fetchAndUpdateReferences(&FetchOptions{
+		RemoteName: o.RemoteName,
+		Depth:      o.Depth,
+		Auth:       o.Auth,
+		Progress:   o.Progress,
+	}, o.ReferenceName)
+	if err != nil {
+		return err
+	}
+
+	if err := w.Reset(&ResetOptions{Commit: head.Hash()}); err != nil {
+		return err
+	}
+
+	if o.RecurseSubmodules != NoRecurseSubmodules {
+		return w.updateSubmodules(o.RecurseSubmodules)
+	}
+
+	return nil
+}
+
+func (w *Worktree) updateSubmodules(recursion SubmoduleRescursivity) error {
+	s, err := w.Submodules()
+	if err != nil {
+		return err
+	}
+
+	return s.Update(&SubmoduleUpdateOptions{
+		Init:              true,
+		RecurseSubmodules: recursion,
+	})
+}
+
 // Checkout switch branches or restore working tree files.
 func (w *Worktree) Checkout(opts *CheckoutOptions) error {
 	if err := opts.Validate(); err != nil {