Skip to content

fix(git): optimize fetch to selectively include tags and checkout exa… #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fpytloun wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(git): optimize fetch to selectively include tags and checkout exa… #427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions pkg/vendir/fetch/git/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,17 +166,20 @@ func (t *Git) fetch(dstPath string, tempArea ctlfetch.TempArea, bundle string) e
}
}

argss = append(argss, []string{"config", "remote.origin.tagOpt", "--tags"})

if bundle != "" {
argss = append(argss, []string{"bundle", "unbundle", bundle})
}

exactRef := false
{
fetchArgs := []string{"fetch", "origin"}
if strings.HasPrefix(t.opts.Ref, "origin/") {
// only fetch the exact ref we're seeking
fetchArgs = append(fetchArgs, t.opts.Ref[7:])
exactRef = true
} else {
// Only fetch tags if not fetching exact ref
argss = append(argss, []string{"config", "remote.origin.tagOpt", "--tags"})
}
if t.opts.Depth > 0 {
fetchArgs = append(fetchArgs, "--depth", strconv.Itoa(t.opts.Depth))
Expand All @@ -201,7 +204,12 @@ func (t *Git) fetch(dstPath string, tempArea ctlfetch.TempArea, bundle string) e
}
}

_, _, err = t.cmdRunner.Run([]string{"-c", "advice.detachedHead=false", "checkout", ref}, env, dstPath)
checkoutRef := ref
if exactRef {
checkoutRef = "FETCH_HEAD"
}

_, _, err = t.cmdRunner.Run([]string{"-c", "advice.detachedHead=false", "checkout", checkoutRef}, env, dstPath)
if err != nil {
return err
}
Expand Down
Loading