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

Reorder args to make more sense

This commit is contained in:
Tim Hockin 2016-08-20 21:03:02 -07:00
parent 119465829f
commit 344eca6507
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -120,7 +120,7 @@ func main() {
initialSync := true initialSync := true
failCount := 0 failCount := 0
for { for {
if err := syncRepo(*flRepo, *flRoot, *flDest, *flBranch, *flRev, *flDepth); err != nil { if err := syncRepo(*flRepo, *flBranch, *flRev, *flDepth, *flRoot, *flDest); err != nil {
if initialSync || failCount >= *flMaxSyncFailures { if initialSync || failCount >= *flMaxSyncFailures {
log.Printf("error syncing repo: %v", err) log.Printf("error syncing repo: %v", err)
os.Exit(1) os.Exit(1)
@ -241,7 +241,7 @@ func addWorktreeAndSwap(gitRoot, dest, branch, rev string) error {
return updateSymlink(gitRoot, dest, worktreePath) return updateSymlink(gitRoot, dest, worktreePath)
} }
func initRepo(repo, dest, branch, rev string, depth int, gitRoot string) error { func initRepo(repo, branch, rev string, depth int, gitRoot string) error {
// clone repo // clone repo
args := []string{"clone", "--no-checkout", "-b", branch} args := []string{"clone", "--no-checkout", "-b", branch}
if depth != 0 { if depth != 0 {
@ -261,13 +261,13 @@ func initRepo(repo, dest, branch, rev string, depth int, gitRoot string) error {
} }
// syncRepo syncs the branch of a given repository to the destination at the given rev. // syncRepo syncs the branch of a given repository to the destination at the given rev.
func syncRepo(repo, gitRoot, dest, branch, rev string, depth int) error { func syncRepo(repo, branch, rev string, depth int, gitRoot, dest string) error {
target := path.Join(gitRoot, dest) target := path.Join(gitRoot, dest)
gitRepoPath := path.Join(target, ".git") gitRepoPath := path.Join(target, ".git")
_, err := os.Stat(gitRepoPath) _, err := os.Stat(gitRepoPath)
switch { switch {
case os.IsNotExist(err): case os.IsNotExist(err):
err = initRepo(repo, target, branch, rev, depth, gitRoot) err = initRepo(repo, branch, rev, depth, gitRoot)
if err != nil { if err != nil {
return err return err
} }