|
|
@ -58,7 +58,7 @@ fn read_git_info() -> Result<(), std::io::Error> {
|
|
|
|
// Combined version
|
|
|
|
// Combined version
|
|
|
|
let version = if let Some(exact) = exact_tag {
|
|
|
|
let version = if let Some(exact) = exact_tag {
|
|
|
|
exact
|
|
|
|
exact
|
|
|
|
} else if &branch != "master" {
|
|
|
|
} else if &branch != "main" && &branch != "master" {
|
|
|
|
format!("{}-{} ({})", last_tag, rev_short, branch)
|
|
|
|
format!("{}-{} ({})", last_tag, rev_short, branch)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
format!("{}-{}", last_tag, rev_short)
|
|
|
|
format!("{}-{}", last_tag, rev_short)
|
|
|
|