fix(args): prepend and output only compatible if paths are different

Signed-off-by: Anton Engelhardt <antoncengelhardt@icloud.com>
orhun · May 26, 2024 · 3b81a56 · 3b81a56
1 parent d250816
commit 3b81a56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/git-cliff/src/lib.rs b/git-cliff/src/lib.rs
@@ -386,9 +386,13 @@ pub fn run(mut args: Opt) -> Result<()> {
 			)));
 		}
 	}
-	if args.output.is_some() && args.prepend.is_some() {
+	if args.output.is_some() &&
+		args.prepend.is_some() &&
+		args.output.as_ref() == args.prepend.as_ref()
+	{
 		return Err(Error::ArgumentError(String::from(
-			"'-o' and '-p' cannot be used together",
+			"'-o' and '-p' can only be used together if they point to different \
+			 files",
 		)));
 	}
 	if args.body.is_some() {

diff --git a/website/docs/usage/examples.md b/website/docs/usage/examples.md
@@ -72,7 +72,7 @@ Prepend new changes to an existing changelog file:
 ```bash
 # 1- changelog header is removed from CHANGELOG.md
 # 2- new entries are prepended to CHANGELOG.md without footer part
-# the --prepend option is incompatible with -o (output)
+# the --prepend option is incompatible with -o (output) if the file paths are equal
 git cliff --unreleased --tag 1.0.0 --prepend CHANGELOG.md
 ```