From edb343a10e76a33b7223aa36d37df350d4ac6df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= <orhunparmaksiz@gmail.com>
Date: Tue, 30 Nov 2021 16:31:00 +0300
Subject: [PATCH] feat(args): support multiple values for `--commit-path`
 argument

---
 README.md                  | 22 +++++++++++-----------
 git-cliff-core/src/repo.rs |  6 ++++--
 git-cliff/src/args.rs      |  4 ++--
 git-cliff/src/lib.rs       |  1 -
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index eaa6d4f930..92f92411ee 100644
--- a/README.md
+++ b/README.md
@@ -146,16 +146,16 @@ git-cliff [FLAGS] [OPTIONS] [RANGE]
 **Options:**
 
 ```
--c, --config <PATH>        Sets the configuration file [env: CONFIG=]  [default: cliff.toml]
--w, --workdir <PATH>       Sets the working directory [env: WORKDIR=]
--r, --repository <PATH>    Sets the git repository [env: REPOSITORY=]
-    --commit-path <PATH>   Sets the directory to parse commits from [env: COMMIT_PATH=]
--p, --prepend <PATH>       Prepends entries to the given changelog file [env: PREPEND=]
--o, --output <PATH>        Writes output to the given file [env: OUTPUT=]
--t, --tag <TAG>            Sets the tag for the latest version [env: TAG=]
--b, --body <TEMPLATE>      Sets the template for the changelog body [env: TEMPLATE=]
--s, --strip <PART>         Strips the given parts from the changelog [possible values: header, footer, all]
-    --sort <sort>          Sets sorting of the commits inside sections [default: oldest] [possible values: oldest, newest]
+-c, --config <PATH>               Sets the configuration file [env: CONFIG=]  [default: cliff.toml]
+-w, --workdir <PATH>              Sets the working directory [env: WORKDIR=]
+-r, --repository <PATH>           Sets the git repository [env: REPOSITORY=]
+    --commit-path <PATTERN>...    Sets the directory to parse commits from [env: COMMIT_PATH=]
+-p, --prepend <PATH>              Prepends entries to the given changelog file [env: PREPEND=
+-o, --output <PATH>               Writes output to the given file [env: OUTPUT=]
+-t, --tag <TAG>                   Sets the tag for the latest version [env: TAG=]
+-b, --body <TEMPLATE>             Sets the template for the changelog body [env: TEMPLATE=]
+-s, --strip <PART>                Strips the given parts from the changelog [possible values: header, footer, all]
+    --sort <sort>                 Sets sorting of the commits inside sections [default: oldest] [possible values: oldest, newest]
 ```
 
 **Args:**
@@ -207,7 +207,7 @@ git cliff HEAD~2..
 Generate a changelog scoped to a specific directory (useful for monorepos):
 
 ```sh
-git cliff --commit-path '**/*.toml'
+git cliff --commit-path "**/*.toml" --commit-path "*.md"
 ```
 
 Sort the commits inside sections:
diff --git a/git-cliff-core/src/repo.rs b/git-cliff-core/src/repo.rs
index e762c995eb..30ffdec955 100644
--- a/git-cliff-core/src/repo.rs
+++ b/git-cliff-core/src/repo.rs
@@ -40,7 +40,7 @@ impl Repository {
 	pub fn commits(
 		&self,
 		range: Option<String>,
-		path: Option<Pattern>,
+		path: Option<Vec<Pattern>>,
 	) -> Result<Vec<Commit>> {
 		let mut revwalk = self.inner.revwalk()?;
 		revwalk.set_sorting(Sort::TIME | Sort::TOPOLOGICAL)?;
@@ -65,7 +65,9 @@ impl Repository {
 						) {
 							return diff.deltas().any(|delta| {
 								delta.new_file().path().map_or(false, |path| {
-									commit_path.matches_path(path)
+									commit_path
+										.iter()
+										.any(|glob| glob.matches_path(path))
 								})
 							});
 						}
diff --git a/git-cliff/src/args.rs b/git-cliff/src/args.rs
index 0b17d3c574..b805ed38da 100644
--- a/git-cliff/src/args.rs
+++ b/git-cliff/src/args.rs
@@ -38,8 +38,8 @@ pub struct Opt {
 	#[structopt(short, long, env, value_name = "PATH")]
 	pub repository:  Option<PathBuf>,
 	/// Sets the directory to parse commits from.
-	#[structopt(long, env, value_name = "PATH")]
-	pub commit_path: Option<Pattern>,
+	#[structopt(long, env, value_name = "PATTERN")]
+	pub commit_path: Option<Vec<Pattern>>,
 	/// Prepends entries to the given changelog file.
 	#[structopt(short, long, env, value_name = "PATH")]
 	pub prepend:     Option<PathBuf>,
diff --git a/git-cliff/src/lib.rs b/git-cliff/src/lib.rs
index f8ef4618bc..618cdbfc99 100644
--- a/git-cliff/src/lib.rs
+++ b/git-cliff/src/lib.rs
@@ -129,7 +129,6 @@ pub fn run(mut args: Opt) -> Result<()> {
 		}
 	}
 	let commits = repository.commits(commit_range, args.commit_path)?;
-
 	// Update tags.
 	if let Some(tag) = args.tag {
 		if let Some(commit_id) = commits.first().map(|c| c.id().to_string()) {