kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename for clarity

This commit is contained in:
Tim Hockin 2023-11-18 14:10:32 -08:00
parent 69eb59185a
commit 04ea5e49fb
No known key found for this signature in database
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.go
View File

@ -117,7 +117,7 @@ const defaultDirMode = os.FileMode(0775) // subject to umask
type repoSync struct { type repoSync struct {
cmd string // the git command to run cmd string // the git command to run
root absPath // absolute path to the root directory root absPath // absolute path to the root directory
repo string // remote repo to sync remoteRepo string // remote repo to sync
ref string // the ref to sync ref string // the ref to sync
depth int // for shallow sync depth int // for shallow sync
submodules submodulesMode // how to handle submodules submodules submodulesMode // how to handle submodules
@ -706,7 +706,7 @@ func main() {
git := &repoSync{ git := &repoSync{
cmd: *flGitCmd, cmd: *flGitCmd,
root: absRoot, root: absRoot,
repo: *flRepo, remoteRepo: *flRepo,
ref: *flRef, ref: *flRef,
depth: *flDepth, depth: *flDepth,
submodules: submodulesMode(*flSubmodules), submodules: submodulesMode(*flSubmodules),
@ -1260,12 +1260,12 @@ func (git *repoSync) initRepo(ctx context.Context) error {
return err return err
} }
// It doesn't exist - make it. // It doesn't exist - make it.
if _, _, err := git.Run(ctx, git.root, "remote", "add", "origin", git.repo); err != nil { if _, _, err := git.Run(ctx, git.root, "remote", "add", "origin", git.remoteRepo); err != nil {
return err return err
} }
} else if strings.TrimSpace(stdout) != git.repo { } else if strings.TrimSpace(stdout) != git.remoteRepo {
// It exists, but is wrong. // It exists, but is wrong.
if _, _, err := git.Run(ctx, git.root, "remote", "set-url", "origin", git.repo); err != nil { if _, _, err := git.Run(ctx, git.root, "remote", "set-url", "origin", git.remoteRepo); err != nil {
return err return err
} }
} }
@ -1715,7 +1715,7 @@ func (git *repoSync) currentWorktree() (worktree, error) {
// and tries to clean up any detritus. This function returns whether the // and tries to clean up any detritus. This function returns whether the
// current hash has changed and what the new hash is. // current hash has changed and what the new hash is.
func (git *repoSync) SyncRepo(ctx context.Context, refreshCreds func(context.Context) error) (bool, string, error) { func (git *repoSync) SyncRepo(ctx context.Context, refreshCreds func(context.Context) error) (bool, string, error) {
git.log.V(3).Info("syncing", "repo", redactURL(git.repo)) git.log.V(3).Info("syncing", "repo", redactURL(git.remoteRepo))
if err := refreshCreds(ctx); err != nil { if err := refreshCreds(ctx); err != nil {
return false, "", fmt.Errorf("credential refresh failed: %w", err) return false, "", fmt.Errorf("credential refresh failed: %w", err)
@ -1840,11 +1840,11 @@ func (git *repoSync) SyncRepo(ctx context.Context, refreshCreds func(context.Con
// fetch retrieves the specified ref from the upstream repo. // fetch retrieves the specified ref from the upstream repo.
func (git *repoSync) fetch(ctx context.Context, ref string) error { func (git *repoSync) fetch(ctx context.Context, ref string) error {
git.log.V(2).Info("fetching", "ref", ref, "repo", redactURL(git.repo)) git.log.V(2).Info("fetching", "ref", ref, "repo", redactURL(git.remoteRepo))
// Fetch the ref and do some cleanup, setting or un-setting the repo's // Fetch the ref and do some cleanup, setting or un-setting the repo's
// shallow flag as appropriate. // shallow flag as appropriate.
args := []string{"fetch", git.repo, ref, "--verbose", "--no-progress", "--prune", "--no-auto-gc"} args := []string{"fetch", git.remoteRepo, ref, "--verbose", "--no-progress", "--prune", "--no-auto-gc"}
if git.depth > 0 { if git.depth > 0 {
args = append(args, "--depth", strconv.Itoa(git.depth)) args = append(args, "--depth", strconv.Itoa(git.depth))
} else { } else {
@ -2014,7 +2014,7 @@ func (git *repoSync) CallAskPassURL(ctx context.Context) error {
} }
} }
if err := git.StoreCredentials(ctx, git.repo, username, password); err != nil { if err := git.StoreCredentials(ctx, git.remoteRepo, username, password); err != nil {
return err return err
} }
@ -2102,7 +2102,7 @@ func (git *repoSync) RefreshGitHubAppToken(ctx context.Context, githubBaseURL, p
username := "-" username := "-"
password := tokenResponse.Token password := tokenResponse.Token
if err := git.StoreCredentials(ctx, git.repo, username, password); err != nil { if err := git.StoreCredentials(ctx, git.remoteRepo, username, password); err != nil {
return err return err
} }