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 2019-10-27 17:40:14 -07:00
parent 5d7622e6ec
commit 415303f900
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/git-sync/main.go
View File

@ -525,7 +525,8 @@ func cloneRepo(ctx context.Context, repo, branch, rev string, depth int, gitRoot
return nil return nil
} }
func hashForRev(ctx context.Context, rev, gitRoot string) (string, error) { // localHashForRev returns the locally known hash for a given rev.
func localHashForRev(ctx context.Context, rev, gitRoot string) (string, error) {
output, err := runCommand(ctx, gitRoot, *flGitCmd, "rev-parse", rev) output, err := runCommand(ctx, gitRoot, *flGitCmd, "rev-parse", rev)
if err != nil { if err != nil {
return "", err return "", err
@ -558,7 +559,7 @@ func revIsHash(ctx context.Context, rev, gitRoot string) (bool, error) {
// hash, the output will be the same hash as the input. Of course, a user // hash, the output will be the same hash as the input. Of course, a user
// could specify "abc" and match "abcdef12345678", so we just do a prefix // could specify "abc" and match "abcdef12345678", so we just do a prefix
// match. // match.
output, err = hashForRev(ctx, rev, gitRoot) output, err = localHashForRev(ctx, rev, gitRoot)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -578,7 +579,7 @@ func syncRepo(ctx context.Context, repo, branch, rev string, depth int, gitRoot,
if err != nil { if err != nil {
return false, "", err return false, "", err
} }
hash, err = hashForRev(ctx, rev, gitRoot) hash, err = localHashForRev(ctx, rev, gitRoot)
if err != nil { if err != nil {
return false, "", err return false, "", err
} }
@ -604,7 +605,7 @@ func syncRepo(ctx context.Context, repo, branch, rev string, depth int, gitRoot,
// getRevs returns the local and upstream hashes for rev. // getRevs returns the local and upstream hashes for rev.
func getRevs(ctx context.Context, localDir, branch, rev string) (string, string, error) { func getRevs(ctx context.Context, localDir, branch, rev string) (string, string, error) {
// Ask git what the exact hash is for rev. // Ask git what the exact hash is for rev.
local, err := hashForRev(ctx, rev, localDir) local, err := localHashForRev(ctx, rev, localDir)
if err != nil { if err != nil {
return "", "", err return "", "", err
} }