fix: fixes origin not being parsed for subcommands

src/commands/releases.rs

@@ -72,6 +72,7 @@ pub fn make_app<'a, 'b: 'a>(app: App<'a, 'b>) -> App<'a, 'b> {
  .about("Create a new release.")
  .version_arg(1)
  .projects_arg()
+ .org_arg()
  // this is deprecated and no longer does anything
  .arg(Arg::with_name("ref")
  .long("ref")

src/config.rs

@@ -268,16 +268,27 @@ impl Config {
 
  /// Given a match object from clap, this returns the org from it.
  pub fn get_org(&self, matches: &ArgMatches<'_>) -> Result<String, Error> {
- Ok(matches
- .value_of("org")
- .map(str::to_owned)
- .or_else(|| env::var("SENTRY_ORG").ok())
- .or_else(|| {
- self.ini
- .get_from(Some("defaults"), "org")
+ match matches.subcommand_name() {
+ None => {
+ Ok(matches
+ .value_of("org")
  .map(str::to_owned)
- })
- .ok_or_else(|| err_msg("An organization slug is required (provide with --org)"))?)
+ .or_else(|| env::var("SENTRY_ORG").ok())
+ .or_else(|| {
+ self.ini
+ .get_from(Some("defaults"), "org")
+ .map(str::to_owned)
+ })
+ .ok_or_else(|| err_msg("An organization slug is required (provide with --org)"))?)
+ }
+ Some(subcommand) => {
+ if let Some(sub_matches) = matches.subcommand_matches(subcommand) {
+ self.get_org(sub_matches)
+ } else {
+ Err(err_msg("An organization slug is required (provide with --org)"))
+ }
+ }
+ }
  }
 
  /// Given a match object from clap, this returns a tuple in the