minor updates

This commit is contained in:
Stephanie You
2023-11-16 17:48:00 -08:00
parent 0f5a26af3a
commit c6ea9725a7
4 changed files with 7 additions and 10 deletions

View File

@@ -440,10 +440,6 @@ func runMain() int {
var fs filesys.Filesys
fs = filesys.LocalFS
dEnv := env.Load(ctx, env.GetCurrentUserHomeDir, fs, doltdb.LocalDirDoltDB, Version)
if dEnv.CfgLoadErr != nil {
cli.PrintErrln(color.RedString("Failed to load the global config. %v", dEnv.CfgLoadErr))
return 1
}
dEnv.IgnoreLockFile = ignoreLockFile
root, err := env.GetCurrentUserHomeDir()
@@ -452,6 +448,10 @@ func runMain() int {
return 1
}
if dEnv.CfgLoadErr != nil {
cli.PrintErrln(color.RedString("Failed to load the global config. %v", dEnv.CfgLoadErr))
return 1
}
globalConfig, ok := dEnv.Config.GetConfig(env.GlobalConfig)
if !ok {
cli.PrintErrln(color.RedString("Failed to get global config"))

View File

@@ -290,7 +290,6 @@ teardown() {
@test "config: config doesn't need write permission in current dir" {
chmod 111 .
run dolt config --list
[ "$status" -eq 0 ]
dolt config --list
chmod 755 .
}

View File

@@ -130,8 +130,7 @@ teardown() {
@test "no-repo: dolt version does not need write permissions" {
chmod 111 .
run dolt version
[ "$status" -eq 0 ]
dolt version
chmod 755 .
}

View File

@@ -391,7 +391,6 @@ teardown() {
@test "profile: profile doesn't need write permission in current dir" {
chmod 111 .
run dolt profile
[ "$status" -eq 0 ]
dolt profile
chmod 755 .
}