fix(cdsctl): ask for context in shell only if current directory is a …

…repository (#3775)
ovh · Dec 31, 2018 · 77e73cf · 77e73cf
1 parent 3b5d805
commit 77e73cf
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/cli/cdsctl/shell.go b/cli/cdsctl/shell.go
@@ -85,21 +85,22 @@ func shellRun(v cli.Values) error {
 		EOFPrompt:         "exit",
 		HistorySearchFold: true,
 	})
-
 	if err != nil {
 		fmt.Printf("Error: %s\n", err)
 	}
 
 	defer l.Close()
 
 	home := "/"
-	// auto-discover current project with .git
-	if _, err := discoverConf([]cli.Arg{
-		{Name: _ProjectKey},
-		{Name: _ApplicationName, AllowEmpty: true},
-		{Name: _WorkflowName, AllowEmpty: true},
-	}); err == nil {
-		if r, err := repo.New("."); err == nil {
+
+	// try to discover conf for existing .git repository
+	r, errR := repo.New(".")
+	if errR == nil {
+		if _, err := discoverConf([]cli.Arg{
+			{Name: _ProjectKey},
+			{Name: _ApplicationName, AllowEmpty: true},
+			{Name: _WorkflowName, AllowEmpty: true},
+		}); err == nil {
 			if proj, _ := r.LocalConfigGet("cds", "project"); proj != "" {
 				home = "/project/" + proj
 				if wf, _ := r.LocalConfigGet("cds", "workflow"); wf != "" {
@@ -110,8 +111,8 @@ func shellRun(v cli.Values) error {
 			}
 		}
 	}
-	current.home = home
 
+	current.home = home
 	current.path = home
 
 	for {