@@ -310,17 +310,15 @@ func (c *Config) setDefaults(workingDir, dataDir string) {
310310 if c.Options.ContextPaths == nil {
311311 c.Options.ContextPaths = []string{}
312312 }
313− if c.Options.DataDirectory == "" {
313+ if dataDir != "" {
314+ c.Options.DataDirectory = dataDir
315+ } else if c.Options.DataDirectory == "" {
314316 if path, ok := fsext.SearchParent(workingDir, defaultDataDirectory); ok {
315317 c.Options.DataDirectory = path
316318 } else {
317319 c.Options.DataDirectory = filepath.Join(workingDir, defaultDataDirectory)
318320 }
319321 }
320− // explicit dataDir flag always takes precedence
321− if dataDir != "" {
322− c.Options.DataDirectory = dataDir
323− }
324322 if c.Providers == nil {
325323 c.Providers = csync.NewMap[string, ProviderConfig]()
326324 }