fork of go-git with some jj specific features
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

git: worktree, Pass context on updateSubmodules. Fixes #1098

+7 -7
+1 -1
repository.go
··· 956 956 } 957 957 958 958 if o.RecurseSubmodules != NoRecurseSubmodules { 959 - if err := w.updateSubmodules(&SubmoduleUpdateOptions{ 959 + if err := w.updateSubmodules(ctx, &SubmoduleUpdateOptions{ 960 960 RecurseSubmodules: o.RecurseSubmodules, 961 961 Depth: func() int { 962 962 if o.ShallowSubmodules {
+3 -3
submodule.go
··· 214 214 return err 215 215 } 216 216 217 - return s.doRecursiveUpdate(r, o) 217 + return s.doRecursiveUpdate(ctx, r, o) 218 218 } 219 219 220 - func (s *Submodule) doRecursiveUpdate(r *Repository, o *SubmoduleUpdateOptions) error { 220 + func (s *Submodule) doRecursiveUpdate(ctx context.Context, r *Repository, o *SubmoduleUpdateOptions) error { 221 221 if o.RecurseSubmodules == NoRecurseSubmodules { 222 222 return nil 223 223 } ··· 236 236 *new = *o 237 237 238 238 new.RecurseSubmodules-- 239 - return l.Update(new) 239 + return l.UpdateContext(ctx, new) 240 240 } 241 241 242 242 func (s *Submodule) fetchAndCheckout(
+3 -3
worktree.go
··· 139 139 } 140 140 141 141 if o.RecurseSubmodules != NoRecurseSubmodules { 142 - return w.updateSubmodules(&SubmoduleUpdateOptions{ 142 + return w.updateSubmodules(ctx, &SubmoduleUpdateOptions{ 143 143 RecurseSubmodules: o.RecurseSubmodules, 144 144 Auth: o.Auth, 145 145 }) ··· 148 148 return nil 149 149 } 150 150 151 - func (w *Worktree) updateSubmodules(o *SubmoduleUpdateOptions) error { 151 + func (w *Worktree) updateSubmodules(ctx context.Context, o *SubmoduleUpdateOptions) error { 152 152 s, err := w.Submodules() 153 153 if err != nil { 154 154 return err 155 155 } 156 156 o.Init = true 157 - return s.Update(o) 157 + return s.UpdateContext(ctx, o) 158 158 } 159 159 160 160 // Checkout switch branches or restore working tree files.