Fix bootstrap when using github:// URL

bernd · bernd · commit d4cee55d7203 · 2017-06-12T14:32:09.000+02:00
diff --git a/cmd/bootstrap.go b/cmd/bootstrap.go
@@ -66,15 +66,18 @@ func bootstrapCommand(cmd *cobra.Command, args []string) {
 		return
 	}
 
+	cloneUrl := repoUrl.SSH()
+
 	if repoUrl.IsHTTPS() {
+		cloneUrl = repoUrl.HTTPS()
 		viper.Set("force-https-repos", true)
 	}
 
 	if bootstrapShallowClone {
 		viper.Set("checkout.shallow-clone", true)
-		git.Git("clone", "--depth=1", "--no-single-branch", repoUrl.URL, bootstrapCheckoutPath)
+		git.Git("clone", "--depth=1", "--no-single-branch", cloneUrl, bootstrapCheckoutPath)
 	} else {
-		git.Git("clone", repoUrl.URL, bootstrapCheckoutPath)
+		git.Git("clone", cloneUrl, bootstrapCheckoutPath)
 	}
 
 	utils.InDirectory(bootstrapCheckoutPath, func() {

Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,18 @@ func bootstrapCommand(cmd *cobra.Command, args []string) {`
`66`	`66`	`return`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ cloneUrl := repoUrl.SSH()`
	`70`	`+`
`69`	`71`	`if repoUrl.IsHTTPS() {`
	`72`	`+ cloneUrl = repoUrl.HTTPS()`
`70`	`73`	`viper.Set("force-https-repos", true)`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`if bootstrapShallowClone {`
`74`	`77`	`viper.Set("checkout.shallow-clone", true)`
`75`		`- git.Git("clone", "--depth=1", "--no-single-branch", repoUrl.URL, bootstrapCheckoutPath)`
	`78`	`+ git.Git("clone", "--depth=1", "--no-single-branch", cloneUrl, bootstrapCheckoutPath)`
`76`	`79`	`} else {`
`77`		`- git.Git("clone", repoUrl.URL, bootstrapCheckoutPath)`
	`80`	`+ git.Git("clone", cloneUrl, bootstrapCheckoutPath)`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`utils.InDirectory(bootstrapCheckoutPath, func() {`