Merge pull request cli#4017 from despreston/des/avoid-migrate

mislav · web-flow · commit 25b6eecc8dd7 · 2021-07-20T13:33:16.000+02:00
Skip auto migrate of config when GH_CONFIG_DIR
diff --git a/internal/config/config_file.go b/internal/config/config_file.go
@@ -40,8 +40,9 @@ func ConfigDir() string {
 		path = filepath.Join(d, ".config", "gh")
 	}
 
-	// If the path does not exist try migrating config from default paths
-	if !dirExists(path) {
+	// If the path does not exist and the GH_CONFIG_DIR flag is not set try
+	// migrating config from default paths.
+	if !dirExists(path) && os.Getenv(GH_CONFIG_DIR) == "" {
 		_ = autoMigrateConfigDir(path)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,9 @@ func ConfigDir() string {`
`40`	`40`	`path = filepath.Join(d, ".config", "gh")`
`41`	`41`	`}`
`42`	`42`
`43`		`- // If the path does not exist try migrating config from default paths`
`44`		`- if !dirExists(path) {`
	`43`	`+ // If the path does not exist and the GH_CONFIG_DIR flag is not set try`
	`44`	`+ // migrating config from default paths.`
	`45`	`+ if !dirExists(path) && os.Getenv(GH_CONFIG_DIR) == "" {`
`45`	`46`	`_ = autoMigrateConfigDir(path)`
`46`	`47`	`}`
`47`	`48`