Merge pull request #4493 from mboersma/git-remote-exists-msg

mboersma · mboersma · commit e3a28b48a451 · 2015-09-16T10:25:47.000-06:00
fix(client): suggest help when git remote creation fails
diff --git a/client/cmd/apps.go b/client/cmd/apps.go
@@ -46,7 +46,13 @@ func AppCreate(id string, buildpack string, remote string, noRemote bool) error
 	}
 
 	if !noRemote {
-		return git.CreateRemote(c.ControllerURL.Host, remote, app.ID)
+		if err = git.CreateRemote(c.ControllerURL.Host, remote, app.ID); err != nil {
+			if err.Error() == "exit status 128" {
+				fmt.Println("To replace the existing git remote entry, run:")
+				fmt.Printf("  git remote rename deis deis.old && deis git:remote -a %s\n", app.ID)
+			}
+			return err
+		}
 	}
 
 	fmt.Println("remote available at", git.RemoteURL(c.ControllerURL.Host, app.ID))

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,13 @@ func AppCreate(id string, buildpack string, remote string, noRemote bool) error`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`if !noRemote {`
`49`		`- return git.CreateRemote(c.ControllerURL.Host, remote, app.ID)`
	`49`	`+ if err = git.CreateRemote(c.ControllerURL.Host, remote, app.ID); err != nil {`
	`50`	`+ if err.Error() == "exit status 128" {`
	`51`	`+ fmt.Println("To replace the existing git remote entry, run:")`
	`52`	`+ fmt.Printf(" git remote rename deis deis.old && deis git:remote -a %s\n", app.ID)`
	`53`	`+ }`
	`54`	`+ return err`
	`55`	`+ }`
`50`	`56`	`}`
`51`	`57`
`52`	`58`	`fmt.Println("remote available at", git.RemoteURL(c.ControllerURL.Host, app.ID))`