lib/git: combine "--tags" options with "--all" on FetchAll

1 files changed, 1 insertions, 20 deletions

diff --git a/lib/git/git.go b/lib/git/git.go
index c2c38670..a77d88ee 100644
--- a/lib/git/git.go
+++ b/lib/git/git.go
@@ -144,7 +144,7 @@ func FetchAll(repoDir string) error {
 	if debug.Value == 0 {
 		cmd.Args = append(cmd.Args, "--quiet")
 	}
-	cmd.Args = append(cmd.Args, "--all")
+	cmd.Args = append(cmd.Args, "--all", "--tags")
 	cmd.Dir = repoDir
 	cmd.Stdout = _stdout
 	cmd.Stderr = _stderr
@@ -158,25 +158,6 @@ func FetchAll(repoDir string) error {
 		err = fmt.Errorf("FetchAll: %s", err)
 	}
 
-	// Fetch all tags.
-	cmd = exec.Command("git", "fetch")
-	if debug.Value == 0 {
-		cmd.Args = append(cmd.Args, "--quiet")
-	}
-	cmd.Args = append(cmd.Args, "--tags")
-	cmd.Dir = repoDir
-	cmd.Stdout = _stdout
-	cmd.Stderr = _stderr
-
-	if debug.Value >= 1 {
-		fmt.Printf("= FetchAll %s %s\n", cmd.Dir, cmd.Args)
-	}
-
-	err = cmd.Run()
-	if err != nil {
-		err = fmt.Errorf("FetchAll: %s", err)
-	}
-
 	return err
 }