add match pattern for git-describe

rustyhorde · Mar 24, 2023 · d8f1015 · d8f1015
1 parent b323d3b
commit d8f1015
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/vergen/src/feature/git/cmd.rs b/vergen/src/feature/git/cmd.rs
@@ -48,10 +48,11 @@ pub(crate) struct Config {
     pub(crate) git_commit_message: bool,
     // git log -1 --pretty=format:'%cI'
     pub(crate) git_commit_timestamp: bool,
-    // git describe --always (optionally --tags, --dirty)
+    // git describe --always (optionally --tags, --dirty, --match)
     pub(crate) git_describe: bool,
     git_describe_dirty: bool,
     git_describe_tags: bool,
+    git_describe_match_pattern: Option<&'static str>,
     // git rev-parse HEAD (optionally with --short)
     pub(crate) git_sha: bool,
     git_sha_short: bool,
@@ -262,7 +263,7 @@ impl EmitBuilder {
             .git_commit_date()
             .git_commit_message()
             .git_commit_timestamp()
-            .git_describe(false, false)
+            .git_describe(false, false, None)
             .git_sha(false)
     }
 
@@ -399,10 +400,11 @@ impl EmitBuilder {
     /// Optionally, add the `dirty` or `tags` flag to describe.
     /// See [`git describe`](https://git-scm.com/docs/git-describe#_options) for more details
     ///
-    pub fn git_describe(&mut self, dirty: bool, tags: bool) -> &mut Self {
+    pub fn git_describe(&mut self, dirty: bool, tags: bool, match_pattern: Option<&'static str>) -> &mut Self {
         self.git_config.git_describe = true;
         self.git_config.git_describe_dirty = dirty;
         self.git_config.git_describe_tags = tags;
+        self.git_config.git_describe_match_pattern = match_pattern;
         self
     }
 
@@ -574,6 +576,10 @@ impl EmitBuilder {
                 if self.git_config.git_describe_tags {
                     describe_cmd.push_str(" --tags");
                 }
+                if let Some(pattern) = self.git_config.git_describe_match_pattern {
+                    describe_cmd.push_str(" --match ");
+                    describe_cmd.push_str(pattern);
+                }
                 add_git_cmd_entry(&describe_cmd, VergenKey::GitDescribe, map)?;
             }
         }
@@ -890,7 +896,7 @@ mod test {
     fn git_all_dirty_tags_short() -> Result<()> {
         let config = EmitBuilder::builder()
             .all_git()
-            .git_describe(true, true)
+            .git_describe(true, true, None)
             .git_sha(true)
             .test_emit()?;
         assert_eq!(9, config.cargo_rustc_env_map.len());

diff --git a/vergen/tests/git_output.rs b/vergen/tests/git_output.rs
@@ -326,7 +326,7 @@ cargo:rerun-if-env-changed=SOURCE_DATE_EPOCH
         let mut stdout_buf = vec![];
         let failed = EmitBuilder::builder()
             .all_git()
-            .git_describe(true, true)
+            .git_describe(true, true, None)
             .git_sha(true)
             .emit_to_at(&mut stdout_buf, Some(clone_path()))?;
         assert!(!failed);
@@ -343,7 +343,7 @@ cargo:rerun-if-env-changed=SOURCE_DATE_EPOCH
         let mut stdout_buf = vec![];
         let failed = EmitBuilder::builder()
             .all_git()
-            .git_describe(true, false)
+            .git_describe(true, false, None)
             .emit_to_at(&mut stdout_buf, Some(clone_path()))?;
         assert!(!failed);
         let output = String::from_utf8_lossy(&stdout_buf);
@@ -358,7 +358,7 @@ cargo:rerun-if-env-changed=SOURCE_DATE_EPOCH
         clone_test_repo();
         assert!(EmitBuilder::builder()
             .all_git()
-            .git_describe(true, true)
+            .git_describe(true, true, None)
             .git_sha(true)
             .emit_at(clone_path())
             .is_ok());