Skip to content

Commit

Permalink
git: don't add to wants if exists, shallow and depth 1
Browse files Browse the repository at this point in the history
Signed-off-by: Arieh Schneier <15041913+AriehSchneier@users.noreply.github.com>
  • Loading branch information
AriehSchneier committed May 24, 2023
1 parent b98b813 commit 2dfdcb9
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ func (r *Remote) fetch(ctx context.Context, o *FetchOptions) (sto storer.Referen
}
}

req.Wants, err = getWants(r.s, refs)
req.Wants, err = getWants(r.s, refs, o.Depth)
if len(req.Wants) > 0 {
req.Haves, err = getHaves(localRefs, remoteRefs, r.s, o.Depth)
if err != nil {
Expand Down Expand Up @@ -997,10 +997,14 @@ func doCalculateRefs(
return err
}

func getWants(localStorer storage.Storer, refs memory.ReferenceStorage) ([]plumbing.Hash, error) {
func getWants(localStorer storage.Storer, refs memory.ReferenceStorage, depth int) ([]plumbing.Hash, error) {
// If depth is anything other than 1 and the repo has shallow commits then just because we have the commit
// at the reference doesn't mean that we don't still need to fetch the parents
shallow := false
if s, _ := localStorer.Shallow(); len(s) > 0 {
shallow = true
if depth != 1 {
if s, _ := localStorer.Shallow(); len(s) > 0 {
shallow = true
}
}

wants := map[plumbing.Hash]bool{}
Expand Down

0 comments on commit 2dfdcb9

Please sign in to comment.