Include git tag in --version output.

Short version (`-V`) is unchanged and displays declared version only.

We also need to fetch git tag in the CI else git will not find it.
(Only on release, for CI we will only have the commit sha)

.github/workflows/pre_release.yml

@@ -73,6 +73,8 @@ jobs:
 
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        fetch-tags: true
 
     - name: Install Rust
       uses: dtolnay/rust-toolchain@stable

.github/workflows/release.yml

@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-tags: true
 
       - name: Publish
         env:

Cargo.toml

@@ -26,7 +26,7 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.0.32", features = ["derive"] }
+clap = { version = "4.0.32", features = ["derive", "cargo"] }
 clap_mangen = "0.2.20"
 clap_complete = "4.5.0"
 human-panic = "2.0.2"
@@ -36,3 +36,5 @@ env_logger = "0.11.5"
 anyhow = "1.0.75"
 log = "0.4.20"
 jbk.workspace = true
+const_format = "0.2.33"
+git-version = "0.3.9"

src/main.rs

@@ -8,8 +8,14 @@ use log::error;
 use std::path::PathBuf;
 use std::process::ExitCode;
 
+const VERSION: &str = const_format::formatcp!(
+    "{} (git:{})",
+    clap::crate_version!(),
+    git_version::git_version!(args = ["--dirty=*", "--tags", "--always"])
+);
+
 #[derive(Parser)]
-#[command(name = "waj", author, version, about, long_about=None)]
+#[command(name = "waj", author, version, long_version=VERSION, about, long_about=None)]
 struct Cli {
     /// Set verbose level. Can be specify several times to augment verbose level.
     #[arg(short, long, action=clap::ArgAction::Count, global=true)]