Merge branch 'no_root_repo_push'

Upstream-commit: bd2a55cd2680b127c426c57204161bc0e2679f03 Component: engine
2013-03-22 17:58:34 -07:00
parent f375f50cbd 1a02694099
commit 189f87f526
1 changed files with 3 additions and 1 deletions
--- a/components/engine/commands.go
+++ b/components/engine/commands.go
@ -420,7 +420,9 @@ func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string

 	tmp := strings.SplitN(local, "/", 2)
 	if len(tmp) == 1 {
-		remote = srv.runtime.authConfig.Username + "/" + local
+		return fmt.Errorf(
+			"Impossible to push a \"root\" repository. Please rename your repository in <user>/<repo> (ex: %s/%s)",
+			srv.runtime.authConfig.Username, local)
 	} else {
 		remote = local
 	}