Skip to content

Commit 93565bf

Browse files
committed
Merge branch 'HigherOrderLogic-patch-1'
2 parents 00ca99f + 6d82e2e commit 93565bf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::process::Command;
22

33
fn main() {
44
let version = Command::new(if cfg!(windows) { "git.exe" } else { "git" })
5-
.args(["describe", "--match=cargo-smart-release-*"])
5+
.args(["describe", "--tags"])
66
.output()
77
.ok()
88
.and_then(|out| parse_describe(&out.stdout))
@@ -13,5 +13,5 @@ fn main() {
1313

1414
fn parse_describe(input: &[u8]) -> Option<String> {
1515
let input = std::str::from_utf8(input).ok()?;
16-
input.trim().to_owned().into()
16+
Some(input.trim().trim_start_matches('v').to_owned())
1717
}

src/cli/options.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[derive(clap::Parser)]
22
#[clap(subcommand_required = true)]
33
#[clap(disable_help_subcommand = true)]
4-
#[clap(disable_version_flag = true)]
4+
#[clap(name = "cargo")]
55
#[clap(bin_name = "cargo")]
66
/// Release workspace crates fearlessly.
77
///
@@ -13,7 +13,7 @@ pub struct Args {
1313

1414
#[derive(clap::Parser)]
1515
pub enum SubCommands {
16-
#[clap(name = "smart-release", version = option_env!("CARGO_SMART_RELEASE_VERSION"))]
16+
#[clap(name = "smart-release", long_version = option_env!("CARGO_SMART_RELEASE_VERSION"))]
1717
/// Release workspace crates fearlessly.
1818
///
1919
/// Use --execute to actually perform the operation.

0 commit comments

Comments
 (0)