From ecb32a674a8cdd5eba8d1e0d8de6f16eb2fce815 Mon Sep 17 00:00:00 2001
From: Ed Page <epage@duosecurity.com>
Date: Mon, 4 Jan 2021 16:16:01 -0600
Subject: [PATCH] fix(config): Merge custom config over repo config

Custom config, like args, is more mutable, so it should be respected
more.
---
 src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 73c142e..ad506a3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -217,13 +217,13 @@ fn init_logging(level: Option<log::Level>) {
 fn load_config(cwd: &std::path::Path, args: &args::Args) -> Result<config::Config, anyhow::Error> {
     let mut config = config::Config::default();
 
-    if let Some(path) = args.custom_config.as_ref() {
-        config.update(&config::Config::from_file(path)?);
-    }
     if !args.isolated {
         let derived = config::Config::derive(cwd)?;
         config.update(&derived);
     }
+    if let Some(path) = args.custom_config.as_ref() {
+        config.update(&config::Config::from_file(path)?);
+    }
 
     config.update(&args.config);
     config.default.update(&args.overrides);