orhun/git-cliff
1
1
Fork 0
mirror of https://github.com/orhun/git-cliff.git synced 2024-12-01 22:24:42 +03:00
Code Issues Projects Releases Wiki Activity

fix(git): return tags by their creation order

Browse Source
This commit is contained in:
orhun 2021-06-22 01:49:09 +03:00
parent 5d616ee249
commit 000a67cd8a
No known key found for this signature in database
GPG Key ID: B928720AEC532117
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
git-cliff-core/src/repo.rs
View File

@ -4,7 +4,6 @@ use crate::error::{
};
use git2::{
Commit,
ObjectType,
Repository as GitRepository,
Sort,
};
@ -58,19 +57,28 @@ impl Repository {
&self,
pattern: &Option<String>,
) -> Result<IndexMap<String, String>> {
let mut tags = IndexMap::new();
let mut tags: Vec<(Commit, String)> = Vec::new();
let tag_names = self.inner.tag_names(pattern.as_deref())?;
for name in tag_names.iter().flatten().map(String::from) {
let obj = self.inner.revparse_single(&name)?;
if let Ok(commit) = obj.clone().into_commit() {
tags.insert(commit.id().to_string(), name);
tags.push((commit, name));
} else if let Some(tag) = obj.as_tag() {
if let Some(ObjectType::Commit) = tag.target_type() {
tags.insert(tag.target_id().to_string(), name);
if let Some(commit) = tag
.target()
.ok()
.map(|target| target.into_commit().ok())
.flatten()
{
tags.push((commit, name));
}
}
}
Ok(tags)
tags.sort_by(|a, b| a.0.time().seconds().cmp(&b.0.time().seconds()));
Ok(tags
.into_iter()
.map(|(a, b)| (a.id().to_string(), b))
.collect())
}
}