fix/gitindex: keep clone setting sync scoped to zoekt metadata

The #635 port accidentally introduced remote.origin.url rewrites for existing clones. That is a behavior change from the original flow and not required for the metadata-diff optimization.

This keeps the update path focused on zoekt settings only, while preserving the return-value signal that triggers reindex when metadata actually changes. The integration test now validates metadata mutation and no-op behavior without expecting remote URL churn.

Test Plan: go test ./...

Amp-Thread-ID: https://ampcode.com/threads/T-019d0c05-51b0-77ee-a1dc-cb60ce14712d
Co-authored-by: Amp <amp@ampcode.com>

Author: keegancsmith

gitindex/clone.go

@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"fmt"
 	"log"
-	"maps"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -39,9 +38,7 @@ func CloneRepo(destDir, name, cloneURL string, settings map[string]string) (stri
 
 	repoDest := filepath.Join(parent, filepath.Base(name)+".git")
 	if _, err := os.Lstat(repoDest); err == nil {
-		// Repository exists, ensure settings are in sync including the clone URL
-		settings := maps.Clone(settings)
-		settings["remote.origin.url"] = cloneURL
+		// Repository exists, ensure zoekt settings are in sync.
 		hadUpdate, err := updateZoektGitConfig(repoDest, settings)
 		if err != nil {
 			return "", fmt.Errorf("failed to update repository settings: %w", err)

gitindex/clone_config.go

@@ -38,8 +38,8 @@ func cloneConfigArgs(settings map[string]string) []string {
 	return args
 }
 
-// updateZoektGitConfig applies zoekt.* settings and remote.origin.url updates
-// to an existing clone. It returns whether the repository config changed.
+// updateZoektGitConfig applies zoekt.* settings to an existing clone.
+// It returns whether the repository config changed.
 func updateZoektGitConfig(repoDest string, settings map[string]string) (bool, error) {
 	changed := false
 	for _, key := range sortedKeys(settings) {

gitindex/clone_test.go

@@ -85,9 +85,7 @@ func gitConfigValue(t *testing.T, repoDir, key string) (string, bool) {
 func TestCloneRepoUpdatesExistingSettings(t *testing.T) {
 	root := t.TempDir()
 	originA := filepath.Join(root, "origin-a.git")
-	originB := filepath.Join(root, "origin-b.git")
 	runScript(t, root, "git init --bare "+originA)
-	runScript(t, root, "git init --bare "+originB)
 
 	destRoot := filepath.Join(root, "repos")
 	repoDest := filepath.Join(destRoot, "owner", "repo.git")
@@ -114,7 +112,7 @@ func TestCloneRepoUpdatesExistingSettings(t *testing.T) {
 		t.Fatalf("got %q want empty destination for unchanged settings", dest)
 	}
 
-	dest, err = CloneRepo(destRoot, "owner/repo", originB, map[string]string{
+	dest, err = CloneRepo(destRoot, "owner/repo", originA, map[string]string{
 		"zoekt.name":        "github.com/owner/repo",
 		"zoekt.description": "",
 	})
@@ -128,7 +126,7 @@ func TestCloneRepoUpdatesExistingSettings(t *testing.T) {
 	if got, ok := gitConfigValue(t, repoDest, "zoekt.description"); ok {
 		t.Fatalf("got stale zoekt.description=%q, want it removed", got)
 	}
-	if got, ok := gitConfigValue(t, repoDest, "remote.origin.url"); !ok || got != originB {
-		t.Fatalf("got remote.origin.url=%q exists=%t want %q/true", got, ok, originB)
+	if got, ok := gitConfigValue(t, repoDest, "remote.origin.url"); !ok || got != originA {
+		t.Fatalf("got remote.origin.url=%q exists=%t want %q/true", got, ok, originA)
 	}
 }