From 984af8dddf2930e6953d1fa9622ff17927792bc2 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 28 Jan 2025 14:22:01 +0100 Subject: [PATCH 1/2] fix: `-s` collision --- cargo-espflash/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs index 1c1e3633..8d49637c 100644 --- a/cargo-espflash/src/main.rs +++ b/cargo-espflash/src/main.rs @@ -53,7 +53,7 @@ enum CargoSubcommand { subcommand: Commands, /// Do not check for updates - #[clap(short, long, global = true, action)] + #[clap(short = 'S', long, global = true, action)] skip_update_check: bool, }, } From 59aa28f803b665001cb0157f8ececb944243c676 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 28 Jan 2025 14:29:05 +0100 Subject: [PATCH 2/2] docs: Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fef4ab93..6485bae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Fixed - - Update the app image SHA in the correct location for padded images (#715) +- Fix `-s` argument collision (#731) ### Removed