hugo/hugolib
Bjørn Erik Pedersen 923dd9d1c1
Fix config loading for "hugo mod init"
We have some commands that will continue even if the config loading fails (e.g. because a module can not be found). In Hugo 0.84.0 we introduced a new `_merge` flag that we removed once the configuration was loaded. But we did not do that in error situations, leading to failures in some situations.

This commit fixes that by making sure the configuration is always cleaned before return, even in error situations.

Fixes #8697
2021-06-27 12:03:43 +02:00
..
assets/images Image resource refactor 2019-08-26 15:00:44 +02:00
filesystems Misc config loading fixes 2021-06-14 17:00:32 +02:00
paths Misc config loading fixes 2021-06-14 17:00:32 +02:00
testdata hugolib: Add a site benchmark 2019-08-16 16:24:21 +02:00
testsite hugolib: Add testfile to .gitignore 2019-07-07 13:01:30 +02:00
404_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
alias.go tpl/fmt: Add erroridf template func 2021-06-07 19:11:03 +02:00
alias_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
breaking_changes_test.go all: Fix minor typos 2020-12-16 12:11:32 +01:00
cascade_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
case_insensitive_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
collections.go tpl/fmt: Add erroridf template func 2021-06-07 19:11:03 +02:00
collections_test.go tests: Convert from testify to quicktest 2019-08-12 13:26:32 +02:00
config.go Fix config loading for "hugo mod init" 2021-06-27 12:03:43 +02:00
config_test.go Fix language menu config regression 2021-06-24 13:03:09 +02:00
configdir_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
content_map.go all: Fix minor typos 2020-12-16 12:11:32 +01:00
content_map_page.go all: Fix minor typos 2020-12-16 12:11:32 +01:00
content_map_test.go Split out the puthe path/filepath functions into common/paths 2021-06-18 10:55:00 +02:00
content_render_hooks_test.go config: Fix merge of config with map[string]string values. 2021-06-22 21:38:28 +02:00
datafiles_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
disableKinds_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
embedded_shortcodes_test.go Upgrade Instagram shortcode 2021-06-08 10:30:45 +02:00
embedded_templates_test.go tpl: Add a terse pagination template variant to improve performance 2021-06-08 10:41:21 +02:00
fileInfo.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
fileInfo_test.go tests: Convert from testify to quicktest 2019-08-12 13:26:32 +02:00
gitinfo.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
hugo_modules_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
hugo_sites.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
hugo_sites_build.go Add Dart Sass support 2020-12-30 17:32:25 +01:00
hugo_sites_build_errors_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
hugo_sites_build_test.go para: Skip para test when not on CI 2020-12-23 19:47:20 +01:00
hugo_sites_multihost_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
hugo_sites_rebuild_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
hugo_smoke_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
image_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
js_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
language_content_dir_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
language_test.go Fix language menu config regression 2021-06-24 13:03:09 +02:00
menu_test.go navigation: Cache and copy Menu for sorting 2021-05-23 10:42:01 +02:00
minify_publisher_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
multilingual.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
openapi_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page.go Fix output format handling for render hooks 2021-03-09 13:26:39 +01:00
page__common.go all: Fix minor typos 2020-12-16 12:11:32 +01:00
page__content.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page__data.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page__menus.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page__meta.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
page__new.go tpl/fmt: Add erroridf template func 2021-06-07 19:11:03 +02:00
page__output.go Fix output format handling for render hooks 2021-03-09 13:26:39 +01:00
page__paginator.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page__paths.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page__per_output.go Fix output format handling for render hooks 2021-03-09 13:26:39 +01:00
page__position.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page__ref.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page__tree.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page_kinds.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page_permalink_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
page_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
page_unwrap.go Make Page an interface 2019-03-23 18:51:22 +01:00
page_unwrap_test.go Add render template hooks for links and images 2019-12-18 11:44:40 +01:00
pagebundler_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
pagecollections.go Split out the puthe path/filepath functions into common/paths 2021-06-18 10:55:00 +02:00
pagecollections_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
pages_capture.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
pages_capture_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
pages_language_merge_test.go Fix BenchmarkMergeByLanguage 2020-12-09 17:47:10 +01:00
pages_process.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
pages_test.go Add a benchmark 2021-05-04 17:59:04 +02:00
paginator_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
permalinker.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
prune_resources.go cache/filecache: Add a cache prune func 2018-11-14 23:14:51 +01:00
resource_chain_babel_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
resource_chain_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
robotstxt_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
rss_test.go tests: Convert from testify to quicktest 2019-08-12 13:26:32 +02:00
shortcode.go Catch incomplete shortcode error 2021-05-24 14:59:02 +02:00
shortcode_page.go Add render template hooks for links and images 2019-12-18 11:44:40 +01:00
shortcode_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
site.go Split out the puthe path/filepath functions into common/paths 2021-06-18 10:55:00 +02:00
site_benchmark_new_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
site_output.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
site_output_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
site_render.go tpl/fmt: Add erroridf template func 2021-06-07 19:11:03 +02:00
site_sections.go Simplify page tree logic 2019-08-08 20:13:39 +02:00
site_sections_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
site_stats_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
site_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
site_url_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
siteJSONEncode_test.go all: Format code with gofumpt 2020-12-03 13:12:58 +01:00
sitemap_test.go tpl/embedded: Exclude pages without Permalink from sitemap 2021-02-06 18:30:09 +01:00
taxonomy.go Simplify page tree logic 2019-08-08 20:13:39 +02:00
taxonomy_test.go all: Fix minor typos 2020-12-16 12:11:32 +01:00
template_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
testhelpers_test.go Misc config loading fixes 2021-06-14 17:00:32 +02:00
translations.go Introduce a tree map for all content 2020-02-18 09:49:42 +01:00