Pull instead of fetch

trickyearlobe · trickyearlobe · commit b263d620d7d5 · 2023-07-24T16:27:36.000+01:00
Signed-off-by: Richard Nixon &lt;richard.nixon@btinternet.com&gt;
diff --git a/main.go b/main.go
@@ -65,7 +65,7 @@ func processRepo(workspace, project, repo, mainBranch string) {
 
 func pullRepo(repoDir, mainBranch string) {
   fmt.Printf("  Pulling %v branch %v\n", repoDir, mainBranch)
-  out, err := exec.Command("git", "-C", repoDir, "fetch", "origin", mainBranch).CombinedOutput()
+  out, err := exec.Command("git", "-C", repoDir, "pull", "origin", mainBranch+":"+mainBranch).CombinedOutput()
   if err != nil {
     fmt.Printf("%v\n", string(out))
   }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func processRepo(workspace, project, repo, mainBranch string) {`
`65`	`65`
`66`	`66`	`func pullRepo(repoDir, mainBranch string) {`
`67`	`67`	`fmt.Printf(" Pulling %v branch %v\n", repoDir, mainBranch)`
`68`		`- out, err := exec.Command("git", "-C", repoDir, "fetch", "origin", mainBranch).CombinedOutput()`
	`68`	`+ out, err := exec.Command("git", "-C", repoDir, "pull", "origin", mainBranch+":"+mainBranch).CombinedOutput()`
`69`	`69`	`if err != nil {`
`70`	`70`	`fmt.Printf("%v\n", string(out))`
`71`	`71`	`}`