pr feedback, make 'dolt config unset' case insensitive

This commit is contained in:
Andy Arthur
2021-09-16 11:35:32 -07:00
parent 90010e8929
commit f5551a3b69
5 changed files with 16 additions and 14 deletions
+4
View File
@@ -219,6 +219,10 @@ func unsetOperation(dEnv *env.DoltEnv, setCfgTypes *set.StrSet, args []string, u
return 1
}
for i, a := range args {
args[i] = strings.ToLower(a)
}
isGlobal := setCfgTypes.Contains(globalParamName)
if cfg, ok := dEnv.Config.GetConfig(newCfgElement(isGlobal)); !ok {
cli.PrintErrln(color.RedString("Unable to read config."))
+1 -3
View File
@@ -38,9 +38,7 @@ const (
DoltEditor = "core.editor"
// todo: analogous Git param is "init.defaultBranch", but
// Dolt config params are case-insensitive
InitBranchName = "init.default_branch"
InitBranchName = "init.defaultbranch"
RemotesApiHostKey = "remotes.default_host"
RemotesApiHostPortKey = "remotes.default_port"
+3 -3
View File
@@ -422,8 +422,8 @@ func (dEnv *DoltEnv) InitDBWithTime(ctx context.Context, nbf *types.NomsBinForma
// InitializeRepoState writes a default repo state to disk, consisting of a master branch and current root hash value.
func (dEnv *DoltEnv) InitializeRepoState(ctx context.Context) error {
init := GetDefaultInitBranch(dEnv.Config)
commit, err := dEnv.DoltDB.ResolveCommitRef(ctx, ref.NewBranchRef(init))
branchName := GetDefaultInitBranch(dEnv.Config)
commit, err := dEnv.DoltDB.ResolveCommitRef(ctx, ref.NewBranchRef(branchName))
if err != nil {
return err
}
@@ -433,7 +433,7 @@ func (dEnv *DoltEnv) InitializeRepoState(ctx context.Context) error {
return err
}
dEnv.RepoState, err = CreateRepoState(dEnv.FS, init)
dEnv.RepoState, err = CreateRepoState(dEnv.FS, branchName)
if err != nil {
return ErrStateUpdate
}
+5 -5
View File
@@ -29,14 +29,14 @@ import (
)
func NewMemoryDbData(ctx context.Context, cfg config.ReadableConfig) (DbData, error) {
initBranch := GetDefaultInitBranch(cfg)
branchName := GetDefaultInitBranch(cfg)
ddb, err := NewMemoryDoltDB(ctx, initBranch)
ddb, err := NewMemoryDoltDB(ctx, branchName)
if err != nil {
return DbData{}, err
}
rs, err := NewMemoryRepoState(ctx, ddb, initBranch)
rs, err := NewMemoryRepoState(ctx, ddb, branchName)
if err != nil {
return DbData{}, err
}
@@ -55,8 +55,8 @@ func NewMemoryDoltDB(ctx context.Context, initBranch string) (*doltdb.DoltDB, er
ddb := doltdb.DoltDBFromCS(cs)
m := "memory"
init := ref.NewBranchRef(initBranch)
err := ddb.WriteEmptyRepoWithCommitTimeAndDefaultBranch(ctx, m, m, doltdb.CommitNowFunc(), init)
branchRef := ref.NewBranchRef(initBranch)
err := ddb.WriteEmptyRepoWithCommitTimeAndDefaultBranch(ctx, m, m, doltdb.CommitNowFunc(), branchRef)
if err != nil {
return nil, err
}
+3 -3
View File
@@ -192,10 +192,10 @@ teardown() {
dolt config --global --add user.name "bats tester"
dolt config --global --add user.email "joshn@doe.com"
dolt config --global --add init.default_branch "main"
dolt config --global --add init.defaultBranch "main"
run dolt config --list
[ "$status" -eq 0 ]
[[ "$output" =~ "init.default_branch = main" ]]
[[ "$output" =~ "init.defaultBranch = main" ]]
dolt init
run dolt status
@@ -206,5 +206,5 @@ teardown() {
[[ "$output" =~ "* main" ]]
# cleanup
dolt config --global --unset init.default_branch
dolt config --global --unset init.defaultBranch
}