fix(git_commit): show last created tag on current commit (#1919)

* fix(git_commit): show last created tag on current commit

* style(git_commit): fixed linter & format alerts on PR checks

* test(git_commit): added 'test_latest_tag_shown_with_tag_enabled'

* test(git_commit): add a second between tags on same commit in 'test_latest_tag_shown_with_tag_enabled'

src/modules/git_commit.rs

@@ -1,5 +1,6 @@
 use super::{Context, Module, RootModuleConfig};
 use git2::Repository;
+use git2::Time;
 
 use crate::configs::git_commit::GitCommitConfig;
 use crate::formatter::StringFormatter;
@@ -47,17 +48,20 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
         let tag_names = git_repo.tag_names(None).ok()?;
         let tag_and_refs = tag_names.iter().flat_map(|name| {
             let full_tag = format!("refs/tags/{}", name.unwrap());
+            let tag_obj = git_repo.find_reference(&full_tag)?.peel_to_tag()?;
+            let sig_obj = tag_obj.tagger().unwrap();
             git_repo
                 .find_reference(&full_tag)
-                .map(|reference| (String::from(name.unwrap()), reference))
+                .map(|reference| (String::from(name.unwrap()), sig_obj.when(), reference))
         });
 
         let mut tag_name = String::new();
-        // Let's check if HEAD has some tag. If several, only gets first...
+        let mut oldest = Time::new(0, 0);
-        for (name, reference) in tag_and_refs {
+        // Let's check if HEAD has some tag. If several, gets last created one...
-            if commit_oid == reference.peel_to_commit().ok()?.id() {
+        for (name, timestamp, reference) in tag_and_refs.rev() {
+            if commit_oid == reference.peel_to_commit().ok()?.id() && timestamp > oldest {
                 tag_name = name;
-                break;
+                oldest = timestamp;
             }
         }
         // If we have tag...
@@ -335,4 +339,76 @@ mod tests {
         assert_eq!(expected, actual);
         Ok(())
     }
+
+    #[test]
+    fn test_latest_tag_shown_with_tag_enabled() -> io::Result<()> {
+        use std::{thread, time};
+
+        let repo_dir = fixture_repo(FixtureProvider::GIT)?;
+
+        let mut git_commit = Command::new("git")
+            .args(&["rev-parse", "HEAD"])
+            .current_dir(&repo_dir.path())
+            .output()?
+            .stdout;
+        git_commit.truncate(7);
+        let commit_output = str::from_utf8(&git_commit).unwrap().trim();
+
+        Command::new("git")
+            .args(&["tag", "v2", "-m", "Testing tags v2"])
+            .current_dir(&repo_dir.path())
+            .output()?;
+
+        // Wait one second between tags
+        thread::sleep(time::Duration::from_millis(1000));
+
+        Command::new("git")
+            .args(&["tag", "v0", "-m", "Testing tags v0", "HEAD~1"])
+            .current_dir(&repo_dir.path())
+            .output()?;
+
+        Command::new("git")
+            .args(&["tag", "v1", "-m", "Testing tags v1"])
+            .current_dir(&repo_dir.path())
+            .output()?;
+
+        let git_tag = Command::new("git")
+            .args(&[
+                "for-each-ref",
+                "--contains",
+                "HEAD",
+                "--sort=-taggerdate",
+                "--count=1",
+                "--format",
+                "%(refname:short)",
+                "refs/tags",
+            ])
+            .current_dir(&repo_dir.path())
+            .output()?
+            .stdout;
+        let tag_output = str::from_utf8(&git_tag).unwrap().trim();
+
+        let expected_output = format!("{} {}", commit_output, tag_output);
+
+        let actual = ModuleRenderer::new("git_commit")
+            .config(toml::toml! {
+                [git_commit]
+                    only_detached = false
+                    tag_disabled = false
+                    tag_symbol = ""
+            })
+            .path(&repo_dir.path())
+            .collect();
+
+        let expected = Some(format!(
+            "{} ",
+            Color::Green
+                .bold()
+                .paint(format!("({})", expected_output.trim()))
+                .to_string()
+        ));
+
+        assert_eq!(expected, actual);
+        Ok(())
+    }
 }