Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

reuse Auth method when recursing submodules, fixes #521 #522

Merged
merged 1 commit into from
Jul 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,10 @@ func (r *Repository) clone(ctx context.Context, o *CloneOptions) error {
}

if o.RecurseSubmodules != NoRecurseSubmodules {
if err := w.updateSubmodules(o.RecurseSubmodules); err != nil {
if err := w.updateSubmodules(&SubmoduleUpdateOptions{
RecurseSubmodules: o.RecurseSubmodules,
Auth: o.Auth,
}); err != nil {
return err
}
}
Expand Down
14 changes: 7 additions & 7 deletions worktree.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,22 @@ func (w *Worktree) PullContext(ctx context.Context, o *PullOptions) error {
}

if o.RecurseSubmodules != NoRecurseSubmodules {
return w.updateSubmodules(o.RecurseSubmodules)
return w.updateSubmodules(&SubmoduleUpdateOptions{
RecurseSubmodules: o.RecurseSubmodules,
Auth: o.Auth,
})
}

return nil
}

func (w *Worktree) updateSubmodules(recursion SubmoduleRescursivity) error {
func (w *Worktree) updateSubmodules(o *SubmoduleUpdateOptions) error {
s, err := w.Submodules()
if err != nil {
return err
}

return s.Update(&SubmoduleUpdateOptions{
Init: true,
RecurseSubmodules: recursion,
})
o.Init = true
return s.Update(o)
}

// Checkout switch branches or restore working tree files.
Expand Down