From 7284047ae55cb4499556724671ed834fbc9c8222 Mon Sep 17 00:00:00 2001
From: Ariel Eli <arielsholet1234@gmail.com>
Date: Wed, 27 May 2026 19:03:28 +0300
Subject: [PATCH 1/6] feat(changelog): warn when template uses remote variables
 without matching feature

When a user's template references variables like `github.contributors`
or `commit.gitlab` but the binary was compiled without the corresponding
feature flag (`github`, `gitlab`, etc.), the rendering silently produces
empty output with no indication of why.

Add a `warn_if_remote_template_variables_without_feature` check in
`Changelog::build` that emits a `tracing::warn` for each remote whose
template variables are present but whose Cargo feature is absent.

Fixes #659
---
 git-cliff-core/src/changelog.rs | 53 +++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/git-cliff-core/src/changelog.rs b/git-cliff-core/src/changelog.rs
index 016243a23f..dca85a7f90 100644
--- a/git-cliff-core/src/changelog.rs
+++ b/git-cliff-core/src/changelog.rs
@@ -52,7 +52,7 @@ impl<'a> Changelog<'a> {
     /// Builds a changelog from releases and config.
     fn build(releases: Vec<Release<'a>>, config: Config) -> Result<Self> {
         let trim = config.changelog.trim;
-        Ok(Self {
+        let changelog = Self {
             releases,
             header_template: match &config.changelog.header {
                 Some(header) => Some(Template::new("header", header.clone(), trim)?),
@@ -65,7 +65,9 @@ impl<'a> Changelog<'a> {
             },
             config,
             additional_context: HashMap::new(),
-        })
+        };
+        warn_if_remote_template_variables_without_feature(&changelog);
+        Ok(changelog)
     }
 
     /// Constructs an instance from a serialized context object.
@@ -658,6 +660,53 @@ impl<'a> Changelog<'a> {
     }
 }
 
+/// Emits a warning when a template references remote-specific variables
+/// (e.g. `github.contributors`) for a provider whose Cargo feature is not
+/// compiled in.  The render itself will fail later with a confusing
+/// "variable not found in context" message; this warning gives users a
+/// clear, actionable hint before that happens.
+fn warn_if_remote_template_variables_without_feature(changelog: &Changelog<'_>) {
+    let templates: Vec<&Template> = [
+        Some(&changelog.body_template),
+        changelog.header_template.as_ref(),
+        changelog.footer_template.as_ref(),
+    ]
+    .into_iter()
+    .flatten()
+    .collect();
+
+    macro_rules! warn_missing_feature {
+        ($feature:literal, $vars:expr, $example:literal) => {
+            #[cfg(not(feature = $feature))]
+            if templates.iter().any(|t| t.contains_variable($vars)) {
+                tracing::warn!(
+                    "Template uses a `{}` variable (e.g. `{}`) but the `{}` feature is not \
+                     enabled. Rebuild git-cliff with `--features {}` or use a binary that \
+                     includes all remote features.",
+                    $feature,
+                    $example,
+                    $feature,
+                    $feature,
+                );
+            }
+        };
+    }
+
+    warn_missing_feature!("github", &["github", "commit.github"], "github.contributors");
+    warn_missing_feature!("gitlab", &["gitlab", "commit.gitlab"], "gitlab.contributors");
+    warn_missing_feature!("gitea", &["gitea", "commit.gitea"], "gitea.contributors");
+    warn_missing_feature!(
+        "bitbucket",
+        &["bitbucket", "commit.bitbucket"],
+        "bitbucket.contributors"
+    );
+    warn_missing_feature!(
+        "azure_devops",
+        &["azure_devops", "commit.azure_devops"],
+        "azure_devops.contributors"
+    );
+}
+
 fn get_body_template(config: &Config, trim: bool) -> Result<Template> {
     let template = Template::new("body", config.changelog.body.clone(), trim)?;
     let deprecated_vars = [

From 83c0fd633aff3cb0301e975b9e00af0d3b26f542 Mon Sep 17 00:00:00 2001
From: Ariel Eli <arielsholet1234@gmail.com>
Date: Wed, 27 May 2026 20:26:39 +0300
Subject: [PATCH 2/6] fix(changelog): avoid unused variable when all remote
 features are enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The warn_if_remote_template_variables_without_feature function declared a
`templates` Vec that was only accessed inside cfg-gated blocks. When all
remote features are compiled in (the default build), every
`#[cfg(not(feature = "..."))]` condition is false, so `templates` is never
read — triggering an unused-variable error under `-D warnings`.

Restructure: move the templates array construction inline inside each
macro expansion. Each branch is self-contained and only compiled when the
corresponding feature is absent, so there is no unused variable in any
build configuration.
---
 git-cliff-core/src/changelog.rs | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/git-cliff-core/src/changelog.rs b/git-cliff-core/src/changelog.rs
index dca85a7f90..36ddea9e94 100644
--- a/git-cliff-core/src/changelog.rs
+++ b/git-cliff-core/src/changelog.rs
@@ -660,29 +660,24 @@ impl<'a> Changelog<'a> {
     }
 }
 
-/// Emits a warning when a template references remote-specific variables
-/// (e.g. `github.contributors`) for a provider whose Cargo feature is not
-/// compiled in.  The render itself will fail later with a confusing
-/// "variable not found in context" message; this warning gives users a
-/// clear, actionable hint before that happens.
+/// Emits a warning when a template references remote-specific variables for a
+/// provider whose Cargo feature is not compiled in.
 fn warn_if_remote_template_variables_without_feature(changelog: &Changelog<'_>) {
-    let templates: Vec<&Template> = [
-        Some(&changelog.body_template),
-        changelog.header_template.as_ref(),
-        changelog.footer_template.as_ref(),
-    ]
-    .into_iter()
-    .flatten()
-    .collect();
-
     macro_rules! warn_missing_feature {
         ($feature:literal, $vars:expr, $example:literal) => {
             #[cfg(not(feature = $feature))]
-            if templates.iter().any(|t| t.contains_variable($vars)) {
+            if [
+                Some(&changelog.body_template),
+                changelog.header_template.as_ref(),
+                changelog.footer_template.as_ref(),
+            ]
+            .into_iter()
+            .flatten()
+            .any(|t| t.contains_variable($vars))
+            {
                 tracing::warn!(
-                    "Template uses a `{}` variable (e.g. `{}`) but the `{}` feature is not \
-                     enabled. Rebuild git-cliff with `--features {}` or use a binary that \
-                     includes all remote features.",
+                    "Template uses `{}` variables (e.g. `{}`) but the `{}` feature is not \
+                     enabled. Rebuild with `--features {}`.",
                     $feature,
                     $example,
                     $feature,

From fbfb0376bad4d41a4e5d8bbd2ad7cc1ee54bcf71 Mon Sep 17 00:00:00 2001
From: Ariel Eli <arielsholet1234@gmail.com>
Date: Thu, 28 May 2026 06:41:23 +0300
Subject: [PATCH 3/6] feat(contributor): add pr_numbers field to
 RemoteContributor

Track all PR numbers for a contributor within a single release in a
new `pr_numbers: Vec<i64>` field, sorted in ascending order. The
existing `pr_number` field is preserved for backward compatibility.
---
 git-cliff-core/src/commit.rs      |  3 ++
 git-cliff-core/src/contributor.rs |  3 ++
 git-cliff-core/src/release.rs     | 80 +++++++++++++++++++++++++++++++
 git-cliff-core/src/remote/mod.rs  | 18 +++++--
 4 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/git-cliff-core/src/commit.rs b/git-cliff-core/src/commit.rs
index afac8c799e..6722c106e8 100644
--- a/git-cliff-core/src/commit.rs
+++ b/git-cliff-core/src/commit.rs
@@ -784,6 +784,7 @@ Refs: #123
             username: None,
             pr_title: Some("feat: do something".to_string()),
             pr_number: None,
+            pr_numbers: vec![],
             pr_labels: vec![String::from("feature"), String::from("deprecation")],
             is_first_time: true,
         });
@@ -845,6 +846,7 @@ Refs: #123
             username: None,
             pr_title: Some("feat: do something".to_string()),
             pr_number: None,
+            pr_numbers: vec![],
             pr_labels: vec![String::from("feature"), String::from("deprecation")],
             is_first_time: true,
         });
@@ -1020,6 +1022,7 @@ Refs: #123
             username: None,
             pr_title: Some("feat: do something".to_string()),
             pr_number: None,
+            pr_numbers: vec![],
             pr_labels: Vec::new(),
             is_first_time: true,
         });
diff --git a/git-cliff-core/src/contributor.rs b/git-cliff-core/src/contributor.rs
index 7477d79535..2ef30b05a0 100644
--- a/git-cliff-core/src/contributor.rs
+++ b/git-cliff-core/src/contributor.rs
@@ -11,6 +11,9 @@ pub struct RemoteContributor {
     pub pr_title: Option<String>,
     /// The pull request that the user created.
     pub pr_number: Option<i64>,
+    /// All pull requests that the user created in this release, sorted in
+    /// ascending order (lowest PR number first).
+    pub pr_numbers: Vec<i64>,
     /// Labels of the pull request.
     pub pr_labels: Vec<String>,
     /// Whether if the user contributed for the first time.
diff --git a/git-cliff-core/src/release.rs b/git-cliff-core/src/release.rs
index 8f87233e1f..462a5ae7bc 100644
--- a/git-cliff-core/src/release.rs
+++ b/git-cliff-core/src/release.rs
@@ -789,6 +789,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 },
@@ -796,6 +797,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 }),
@@ -808,6 +810,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("2")),
                     pr_number: Some(66),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 },
@@ -815,6 +818,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("2")),
                     pr_number: Some(66),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 }),
@@ -827,6 +831,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: Some(String::from("3")),
                     pr_number: Some(53),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 },
@@ -834,6 +839,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: Some(String::from("3")),
                     pr_number: Some(53),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 }),
@@ -846,6 +852,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: Some(String::from("4")),
                     pr_number: Some(1_000),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 },
@@ -853,6 +860,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: Some(String::from("4")),
                     pr_number: Some(1_000),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 }),
@@ -865,6 +873,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("5")),
                     pr_number: Some(999_999),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("github")],
                     is_first_time: false,
                 },
@@ -872,6 +881,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("5")),
                     pr_number: Some(999_999),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("github")],
                     is_first_time: false,
                 }),
@@ -884,6 +894,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -891,6 +902,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -907,6 +919,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -914,6 +927,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![42, 66, 999_999],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: true,
                 },
@@ -921,6 +935,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: Some(String::from("3")),
                     pr_number: Some(53),
+                    pr_numbers: vec![53],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: true,
                 },
@@ -928,6 +943,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: Some(String::from("4")),
                     pr_number: Some(1_000),
+                    pr_numbers: vec![1_000],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: true,
                 },
@@ -1157,6 +1173,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(1),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 },
@@ -1164,6 +1181,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(1),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 }),
@@ -1176,6 +1194,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1183,6 +1202,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1195,6 +1215,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1202,6 +1223,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1214,6 +1236,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1221,6 +1244,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1233,6 +1257,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1240,6 +1265,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1252,6 +1278,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1259,6 +1286,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1275,6 +1303,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(1),
+                    pr_numbers: vec![1],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 },
@@ -1282,6 +1311,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -1289,6 +1319,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -1296,6 +1327,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -1499,6 +1531,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 },
@@ -1506,6 +1539,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 }),
@@ -1518,6 +1552,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("2")),
                     pr_number: Some(66),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 },
@@ -1525,6 +1560,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("2")),
                     pr_number: Some(66),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: false,
                 }),
@@ -1537,6 +1573,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: Some(String::from("3")),
                     pr_number: Some(53),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 },
@@ -1544,6 +1581,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: Some(String::from("3")),
                     pr_number: Some(53),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 }),
@@ -1556,6 +1594,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: Some(String::from("4")),
                     pr_number: Some(1_000),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 },
@@ -1563,6 +1602,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: Some(String::from("4")),
                     pr_number: Some(1_000),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: false,
                 }),
@@ -1575,6 +1615,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("5")),
                     pr_number: Some(999_999),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("github")],
                     is_first_time: false,
                 },
@@ -1582,6 +1623,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("5")),
                     pr_number: Some(999_999),
+                    pr_numbers: vec![],
                     pr_labels: vec![String::from("github")],
                     is_first_time: false,
                 }),
@@ -1594,6 +1636,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1601,6 +1644,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1617,6 +1661,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -1624,6 +1669,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![42, 66, 999_999],
                     pr_labels: vec![String::from("rust")],
                     is_first_time: true,
                 },
@@ -1631,6 +1677,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: Some(String::from("3")),
                     pr_number: Some(53),
+                    pr_numbers: vec![53],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: true,
                 },
@@ -1638,6 +1685,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: Some(String::from("4")),
                     pr_number: Some(1_000),
+                    pr_numbers: vec![1_000],
                     pr_labels: vec![String::from("deps")],
                     is_first_time: true,
                 },
@@ -1795,6 +1843,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(1),
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1802,6 +1851,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(1),
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1814,6 +1864,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1821,6 +1872,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1833,6 +1885,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1840,6 +1893,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1852,6 +1906,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1859,6 +1914,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1871,6 +1927,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1878,6 +1935,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1890,6 +1948,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -1897,6 +1956,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -1913,6 +1973,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -1920,6 +1981,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -1927,6 +1989,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -1934,6 +1997,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(1),
+                    pr_numbers: vec![1],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -2106,6 +2170,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -2113,6 +2178,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -2125,6 +2191,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -2132,6 +2199,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -2144,6 +2212,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -2151,6 +2220,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -2163,6 +2233,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -2170,6 +2241,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -2182,6 +2254,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -2189,6 +2262,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -2201,6 +2275,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
@@ -2208,6 +2283,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: false,
                 }),
@@ -2227,6 +2303,7 @@ mod test {
                     username: Some(String::from("nuhro")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -2234,6 +2311,7 @@ mod test {
                     username: Some(String::from("awesome_contributor")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -2241,6 +2319,7 @@ mod test {
                     username: Some(String::from("someone")),
                     pr_title: None,
                     pr_number: None,
+                    pr_numbers: vec![],
                     pr_labels: vec![],
                     is_first_time: true,
                 },
@@ -2248,6 +2327,7 @@ mod test {
                     username: Some(String::from("orhun")),
                     pr_title: Some(String::from("1")),
                     pr_number: Some(42),
+                    pr_numbers: vec![42],
                     pr_labels: vec![],
                     is_first_time: false,
                 },
diff --git a/git-cliff-core/src/remote/mod.rs b/git-cliff-core/src/remote/mod.rs
index d718c0d63c..f0180ec7b3 100644
--- a/git-cliff-core/src/remote/mod.rs
+++ b/git-cliff-core/src/remote/mod.rs
@@ -216,14 +216,25 @@ macro_rules! update_release_metadata {
                         commit.$remote.pr_title = pull_request.and_then(|v| v.title().clone());
                         commit.$remote.pr_labels =
                             pull_request.map(|v| v.labels().clone()).unwrap_or_default();
-                        if !contributors
-                            .iter()
-                            .any(|v| commit.$remote.username == v.username)
+                        if let Some(existing) = contributors
+                            .iter_mut()
+                            .find(|v| commit.$remote.username == v.username)
                         {
+                            if let Some(pr_num) = commit.$remote.pr_number {
+                                if !existing.pr_numbers.contains(&pr_num) {
+                                    existing.pr_numbers.push(pr_num);
+                                }
+                            }
+                        } else {
                             contributors.push(RemoteContributor {
                                 username: commit.$remote.username.clone(),
                                 pr_title: commit.$remote.pr_title.clone(),
                                 pr_number: commit.$remote.pr_number,
+                                pr_numbers: commit
+                                    .$remote
+                                    .pr_number
+                                    .into_iter()
+                                    .collect(),
                                 pr_labels: commit.$remote.pr_labels.clone(),
                                 is_first_time: false,
                             });
@@ -243,6 +254,7 @@ macro_rules! update_release_metadata {
                 self.$remote.contributors = contributors
                     .into_iter()
                     .map(|mut v| {
+                        v.pr_numbers.sort_unstable();
                         v.is_first_time = !commits
                             .iter()
                             .filter(|commit| {

From f68d53b0da2c51126be56bda60d16cc9a1ecc365 Mon Sep 17 00:00:00 2001
From: Ariel Eli <arielsholet1234@gmail.com>
Date: Thu, 28 May 2026 19:04:45 +0300
Subject: [PATCH 4/6] fix: apply nightly rustfmt formatting

---
 git-cliff-core/src/changelog.rs  | 15 +++++++++++++--
 git-cliff-core/src/remote/mod.rs |  6 +-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/git-cliff-core/src/changelog.rs b/git-cliff-core/src/changelog.rs
index 36ddea9e94..0632f53bfa 100644
--- a/git-cliff-core/src/changelog.rs
+++ b/git-cliff-core/src/changelog.rs
@@ -663,6 +663,9 @@ impl<'a> Changelog<'a> {
 /// Emits a warning when a template references remote-specific variables for a
 /// provider whose Cargo feature is not compiled in.
 fn warn_if_remote_template_variables_without_feature(changelog: &Changelog<'_>) {
+    // `changelog` is only referenced inside #[cfg(not(feature = "..."))] blocks;
+    // when all remote features are enabled every block is compiled out.
+    let _ = changelog;
     macro_rules! warn_missing_feature {
         ($feature:literal, $vars:expr, $example:literal) => {
             #[cfg(not(feature = $feature))]
@@ -687,8 +690,16 @@ fn warn_if_remote_template_variables_without_feature(changelog: &Changelog<'_>)
         };
     }
 
-    warn_missing_feature!("github", &["github", "commit.github"], "github.contributors");
-    warn_missing_feature!("gitlab", &["gitlab", "commit.gitlab"], "gitlab.contributors");
+    warn_missing_feature!(
+        "github",
+        &["github", "commit.github"],
+        "github.contributors"
+    );
+    warn_missing_feature!(
+        "gitlab",
+        &["gitlab", "commit.gitlab"],
+        "gitlab.contributors"
+    );
     warn_missing_feature!("gitea", &["gitea", "commit.gitea"], "gitea.contributors");
     warn_missing_feature!(
         "bitbucket",
diff --git a/git-cliff-core/src/remote/mod.rs b/git-cliff-core/src/remote/mod.rs
index f0180ec7b3..2dc62dce96 100644
--- a/git-cliff-core/src/remote/mod.rs
+++ b/git-cliff-core/src/remote/mod.rs
@@ -230,11 +230,7 @@ macro_rules! update_release_metadata {
                                 username: commit.$remote.username.clone(),
                                 pr_title: commit.$remote.pr_title.clone(),
                                 pr_number: commit.$remote.pr_number,
-                                pr_numbers: commit
-                                    .$remote
-                                    .pr_number
-                                    .into_iter()
-                                    .collect(),
+                                pr_numbers: commit.$remote.pr_number.into_iter().collect(),
                                 pr_labels: commit.$remote.pr_labels.clone(),
                                 is_first_time: false,
                             });

From 4717578c10d7d1f3cce2574dfd486913ec59c5ea Mon Sep 17 00:00:00 2001
From: Ariel Eli <arieleli@MacBook-Air-sl-Ariel.local>
Date: Mon, 1 Jun 2026 16:33:18 +0300
Subject: [PATCH 5/6] fix(contributor): use serde default for pr_numbers to
 keep backward compat

---
 git-cliff-core/src/contributor.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-cliff-core/src/contributor.rs b/git-cliff-core/src/contributor.rs
index 2ef30b05a0..58cd2f3c49 100644
--- a/git-cliff-core/src/contributor.rs
+++ b/git-cliff-core/src/contributor.rs
@@ -13,6 +13,7 @@ pub struct RemoteContributor {
     pub pr_number: Option<i64>,
     /// All pull requests that the user created in this release, sorted in
     /// ascending order (lowest PR number first).
+    #[serde(default)]
     pub pr_numbers: Vec<i64>,
     /// Labels of the pull request.
     pub pr_labels: Vec<String>,

From d1d9530a797cc6d74948a3a9adabc199b782c973 Mon Sep 17 00:00:00 2001
From: Ariel Eli <arieleli@MacBook-Air-sl-Ariel.local>
Date: Mon, 1 Jun 2026 17:15:06 +0300
Subject: [PATCH 6/6] feat(git): skip commits listed in .git-blame-ignore-revs

---
 git-cliff-core/src/lib.rs |  2 ++
 git-cliff/src/lib.rs      | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/git-cliff-core/src/lib.rs b/git-cliff-core/src/lib.rs
index 2f0ec12a73..3e3700174b 100644
--- a/git-cliff-core/src/lib.rs
+++ b/git-cliff-core/src/lib.rs
@@ -60,6 +60,8 @@ pub const CONFIG_FILES: &[&str] = &["cliff.toml", ".cliff.toml", ".config/cliff.
 pub const DEFAULT_OUTPUT: &str = "CHANGELOG.md";
 /// Default ignore file.
 pub const IGNORE_FILE: &str = ".cliffignore";
+/// Git blame ignore revs file.
+pub const BLAME_IGNORE_REVS_FILE: &str = ".git-blame-ignore-revs";
 
 /// Sets a human-readable message on the current progress bar span.
 /// This macro only has effect if the `tracing-indicatif` feature is enabled.
diff --git a/git-cliff/src/lib.rs b/git-cliff/src/lib.rs
index bcb5b62bbf..5cb8fa7264 100644
--- a/git-cliff/src/lib.rs
+++ b/git-cliff/src/lib.rs
@@ -25,7 +25,7 @@ use git_cliff_core::embed::{BuiltinConfig, EmbeddedConfig};
 use git_cliff_core::error::{Error, Result};
 use git_cliff_core::release::Release;
 use git_cliff_core::repo::{Repository, SubmoduleRange};
-use git_cliff_core::{DEFAULT_CONFIG, IGNORE_FILE};
+use git_cliff_core::{BLAME_IGNORE_REVS_FILE, DEFAULT_CONFIG, IGNORE_FILE};
 use glob::Pattern;
 
 /// Checks for a new version on crates.io
@@ -786,6 +786,16 @@ pub fn run_with_changelog_modifier<'a>(
                     .collect::<Vec<String>>();
                 skip_list.extend(commits);
             }
+            let blame_ignore_file = repository.root_path()?.join(BLAME_IGNORE_REVS_FILE);
+            if blame_ignore_file.exists() {
+                let contents = fs::read_to_string(&blame_ignore_file)?;
+                let commits = contents
+                    .lines()
+                    .filter(|v| !(v.starts_with('#') || v.trim().is_empty()))
+                    .map(|v| String::from(v.trim()))
+                    .collect::<Vec<String>>();
+                skip_list.extend(commits);
+            }
             if let Some(ref skip_commit) = args.skip_commit {
                 skip_list.extend(skip_commit.clone());
             }