Skip to content

Commit

Permalink
Combine RepoConfig with the one taken the higher importance on the …
Browse files Browse the repository at this point in the history
…right side.

This is done in the `RepoConfigLoader` with the default config and the supplied additional configs.
And now here in the same way.

The `RepoConfig.combine`  function treats the 2nd argument as the one overwriting the 1st one in cas emerging doesn't make sense. This applies at the moment only for "pin".
  • Loading branch information
mzuehlke committed May 6, 2024
1 parent 60f1864 commit 7e306e1
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ final class RepoConfigAlg[F[_]](maybeGlobalRepoConfig: Option[RepoConfig])(impli
F: MonadThrow[F]
) {
def mergeWithGlobal(maybeRepoConfig: Option[RepoConfig]): RepoConfig =
(maybeRepoConfig |+| maybeGlobalRepoConfig).getOrElse(RepoConfig.empty)
(maybeGlobalRepoConfig |+| maybeRepoConfig).getOrElse(RepoConfig.empty)

def readRepoConfig(repo: Repo): F[ConfigParsingResult] =
for {
Expand Down

0 comments on commit 7e306e1

Please sign in to comment.