Fix Git 2.46 logic bug in ListRemotes

zombiezen · zombiezen · commit 974b59e4a581 · 2024-11-02T19:00:06.000-07:00
diff --git a/config.go b/config.go
@@ -213,9 +213,13 @@ func (cfg *Config) ListRemotes() map[string]*Remote {
 	}
 	for _, remote := range remotes {
 		if improvedHandling {
-			remote.FetchURL = remote.Name
-		}
-		if !pushURLsSet[remote.Name] {
+			if remote.FetchURL == "" {
+				remote.FetchURL = remote.Name
+			}
+			if remote.PushURL == "" {
+				remote.PushURL = remote.FetchURL
+			}
+		} else if !pushURLsSet[remote.Name] {
 			remote.PushURL = remote.FetchURL
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,13 @@ func (cfg Config) ListRemotes() map[string]Remote {`
`213`	`213`	`}`
`214`	`214`	`for _, remote := range remotes {`
`215`	`215`	`if improvedHandling {`
`216`		`- remote.FetchURL = remote.Name`
`217`		`- }`
`218`		`- if !pushURLsSet[remote.Name] {`
	`216`	`+ if remote.FetchURL == "" {`
	`217`	`+ remote.FetchURL = remote.Name`
	`218`	`+ }`
	`219`	`+ if remote.PushURL == "" {`
	`220`	`+ remote.PushURL = remote.FetchURL`
	`221`	`+ }`
	`222`	`+ } else if !pushURLsSet[remote.Name] {`
`219`	`223`	`remote.PushURL = remote.FetchURL`
`220`	`224`	`}`
`221`	`225`	`}`