Guard against filesystem paths in git.ReadBranchConfig

mislav · mislav · commit 3907914225c9 · 2020-03-26T19:23:17.000+01:00
A valid remote specificication read from `branch.&lt;name&gt;.remote` git
config can be a URL, a `.`, a filesystem path, and a remote name. When
detecting the remote name, be sure not to take filesystem paths instead.
diff --git a/git/git.go b/git/git.go
@@ -173,7 +173,7 @@ func ReadBranchConfig(branch string) (cfg BranchConfig) {
 					continue
 				}
 				cfg.RemoteURL = u
-			} else {
+			} else if !isFilesystemPath(parts[1]) {
 				cfg.RemoteName = parts[1]
 			}
 		case "merge":
@@ -183,6 +183,10 @@ func ReadBranchConfig(branch string) (cfg BranchConfig) {
 	return
 }
 
+func isFilesystemPath(p string) bool {
+	return p == "." || strings.HasPrefix(p, "./") || strings.HasPrefix(p, "/")
+}
+
 // ToplevelDir returns the top-level directory path of the current repository
 func ToplevelDir() (string, error) {
 	showCmd := exec.Command("git", "rev-parse", "--show-toplevel")

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ func ReadBranchConfig(branch string) (cfg BranchConfig) {`
`173`	`173`	`continue`
`174`	`174`	`}`
`175`	`175`	`cfg.RemoteURL = u`
`176`		`- } else {`
	`176`	`+ } else if !isFilesystemPath(parts[1]) {`
`177`	`177`	`cfg.RemoteName = parts[1]`
`178`	`178`	`}`
`179`	`179`	`case "merge":`
`@@ -183,6 +183,10 @@ func ReadBranchConfig(branch string) (cfg BranchConfig) {`
`183`	`183`	`return`
`184`	`184`	`}`
`185`	`185`
	`186`	`+func isFilesystemPath(p string) bool {`
	`187`	`+ return p == "." \|\| strings.HasPrefix(p, "./") \|\| strings.HasPrefix(p, "/")`
	`188`	`+}`
	`189`	`+`
`186`	`190`	`// ToplevelDir returns the top-level directory path of the current repository`
`187`	`191`	`func ToplevelDir() (string, error) {`
`188`	`192`	`showCmd := exec.Command("git", "rev-parse", "--show-toplevel")`