fix: correct merging of extends from remote config (#529)

evilmartians · Jul 24, 2023 · 7fb992f · 7fb992f
1 parent 41e1f60
commit 7fb992f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal/config/load.go b/internal/config/load.go
@@ -158,6 +158,11 @@ func mergeRemote(fs afero.Fs, repo *git.Repository, v *viper.Viper) error {
 		return err
 	}
 
+	// Reset extends to omit issues when extending with remote extends.
+	if err := v.MergeConfigMap(map[string]interface{}{"extends": nil}); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -171,6 +176,7 @@ func extend(v *viper.Viper, root string) error {
 			return err
 		}
 	}
+
 	return nil
 }