From a3cd74c29be02dde0d65e0dcf79bccc8d41952ed Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 10 Oct 2019 10:00:45 -0700 Subject: `--metadata-file`: when multiple files specified, second takes precedence... on conflicting fields. This changes earlier behavior (but not in a release), where first took precedence. Note that this may seem inconsistent with the behavior of multiple YAML blocks within a document, where the first takes precedence. Still, it is convenient to be able to override defaults with options later on the command line. --- test/command/5700-metadata-file-1.yml | 2 +- test/command/5700-metadata-file-2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/command') diff --git a/test/command/5700-metadata-file-1.yml b/test/command/5700-metadata-file-1.yml index df64e99c5..8289c392b 100644 --- a/test/command/5700-metadata-file-1.yml +++ b/test/command/5700-metadata-file-1.yml @@ -1 +1 @@ -title: Multiple metadata files test +title: This title should be overridden by 5700-metadta-file-2.yml diff --git a/test/command/5700-metadata-file-2.yml b/test/command/5700-metadata-file-2.yml index e865ed55d..1d5510e07 100644 --- a/test/command/5700-metadata-file-2.yml +++ b/test/command/5700-metadata-file-2.yml @@ -1,2 +1,2 @@ -title: This title should be overridden by 5700-metadta-file-2.yml +title: Multiple metadata files test desc: Both of these files should be loaded. -- cgit v1.2.3