Skip to content

[content-service] do git config after we have an init'd folder #19206

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

Merged
roboquat merged 6 commits into from
Dec 13, 2023
Merged

[content-service] do git config after we have an init'd folder #19206

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c28d32b
[content-service] do git config after we have a folder
kylos101 Dec 6, 2023
6170aff
the pwd is not a git folder, set the context explicitly
kylos101 Dec 7, 2023
139099c
Must use git client, before cloning, otherwise git isn't initialized
kylos101 Dec 7, 2023
42efd3d
Oops, clone is creating the location
kylos101 Dec 8, 2023
84fd0e7
Ah, folder must exist and be git init'd (from the clone)
kylos101 Dec 8, 2023
cb36e59
No need to specify location anymore
kylos101 Dec 8, 2023
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
26 changes: 13 additions & 13 deletions components/content-service/pkg/initializer/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,6 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping)
return
}

// https://github.blog/2019-11-03-highlights-from-git-2-24/
err = ws.Git(ctx, "config", "feature.manyFiles", "true")
if err != nil {
log.WithError(err).Error("cannot configure feature.manyFiles")
}

// commit-graph after every git fetch command that downloads a pack-file from a remote
err = ws.Git(ctx, "config", "fetch.writeCommitGraph", "true")
if err != nil {
log.WithError(err).Error("cannot configure fetch.writeCommitGraph")
}

gitClone := func() error {
if err := os.MkdirAll(ws.Location, 0775); err != nil {
log.WithError(err).WithField("location", ws.Location).Error("cannot create directory")
Expand Down Expand Up @@ -122,9 +110,21 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping)
return err
}

// we can only do `git config` stuffs after having a directory that is also git init'd
// https://github.blog/2019-11-03-highlights-from-git-2-24/
err = ws.Git(ctx, "config", "feature.manyFiles", "true")
if err != nil {
log.WithError(err).WithField("location", ws.Location).Error("cannot configure feature.manyFiles")
}
// commit-graph after every git fetch command that downloads a pack-file from a remote
err = ws.Git(ctx, "config", "fetch.writeCommitGraph", "true")
if err != nil {
log.WithError(err).WithField("location", ws.Location).Error("cannot configure fetch.writeCommitGraph")
}

err = ws.Git(ctx, "config", "--replace-all", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*")
if err != nil {
log.WithError(err).WithField("location", ws.Location).Error("cannot configure fecth behavior")
log.WithError(err).WithField("location", ws.Location).Error("cannot configure fetch behavior")
}

err = ws.Git(ctx, "config", "--replace-all", "checkout.defaultRemote", "origin")
Expand Down