add detectGitRemoteUrlChange

g10k_test.go

@@ -1274,7 +1274,7 @@ func TestConfigRetryGitCommands(t *testing.T) {
 	if exitCode != 0 {
 		t.Errorf("terminated with %v, but we expected exit status %v", exitCode, 0)
 	}
-	//fmt.Println(string(out))
+	// fmt.Println(string(out))
 	if !strings.Contains(string(out), "WARN: git command failed: git --git-dir /tmp/g10k/modules/https-__github.com_puppetlabs_puppetlabs-firewall.git remote update --prune deleting local cached repository and retrying...") {
 		t.Errorf("terminated with the correct exit code, but the expected output was missing. out: %s", string(out))
 	}

git.go

@@ -115,7 +115,11 @@ func doMirrorOrUpdate(gitModule GitModule, workDir string, retryCount int) bool
 		gitCmd = "git clone --single-branch --branch " + gitModule.tree + " " + gitModule.git + " " + workDir
 	}
 	if isDir(workDir) {
-		gitCmd = "git --git-dir " + workDir + " remote update --prune"
+		if detectGitRemoteURLChange(workDir, gitModule.git) && isControlRepo {
+			purgeDir(workDir, "git remote url changed")
+		} else {
+			gitCmd = "git --git-dir " + workDir + " remote update --prune"
+		}
 	}
 
 	if explicitlyLoadSSHKey {
@@ -317,3 +321,21 @@ func detectDefaultBranch(gitDir string) string {
 	//fmt.Println(defaultBranch)
 	return defaultBranch
 }
+
+func detectGitRemoteURLChange(d string, url string) bool {
+	gitRemoteCmd := "git --git-dir " + d + " remote -v"
+
+	er := executeCommand(gitRemoteCmd, config.Timeout, false)
+	if er.returnCode != 0 {
+		Warnf("WARN: Could not detect remote URL for git repository " + d + " trying to purge it and mirror it again")
+		return true
+	}
+
+	f := strings.Fields(er.output)
+	if len(f) < 3 {
+		Warnf("WARN: Could not detect remote URL for git repository " + d + " trying to purge it and mirror it again")
+		return true
+	}
+	configuredRemote := f[1]
+	return configuredRemote != url
+}

stale.go

@@ -115,7 +115,7 @@ func checkForStaleContent(workDir string) {
 		}
 
 		if stale {
-			Infof("Removing unmanaged path " + path)
+			Debugf("Removing unmanaged path " + path)
 			purgeDir(path, "checkForStaleContent()")
 		}
 		return nil