From 7dc902f5dbd4a29594a2f6b5d4946d60216ddb60 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Fri, 28 Nov 2025 19:53:46 -0800 Subject: [PATCH] Fix for an incorrect diff command shown when running the "generate config" action with a source configuration file (#1194). --- NEWS | 4 ++++ borgmatic/actions/config/generate.py | 4 ++-- pyproject.toml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index aa665120..31932ad1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +2.0.13.dev0 + * #1194: Fix for an incorrect diff command shown when running the "generate config" action with a + source configuration file. + 2.0.12 * #1127: Fix for the database hooks not respecting the "working_directory" option. * #1181: Add an "ask_for_password" option to the KeePassXC credential hook for disabling diff --git a/borgmatic/actions/config/generate.py b/borgmatic/actions/config/generate.py index 1af8e688..006b2b88 100644 --- a/borgmatic/actions/config/generate.py +++ b/borgmatic/actions/config/generate.py @@ -36,12 +36,12 @@ def run_generate(generate_arguments, global_arguments): if generate_arguments.source_filename: logger.answer( f''' -Merged in the contents of configuration file at: {generate_arguments.source_filename}''' +Merged the contents of the source configuration file: {generate_arguments.source_filename}''' ) if not generate_arguments.split: logger.answer( - '''To review the changes made, run: + f'''To review the changes made, run: diff --unified {generate_arguments.source_filename} {generate_arguments.destination_path}''', ) diff --git a/pyproject.toml b/pyproject.toml index 18749b01..264987a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "borgmatic" -version = "2.0.12" +version = "2.0.13.dev0" authors = [ { name="Dan Helfman", email="witten@torsion.org" }, ]