Skip to content

fix: make --git work with --branch again #3323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruben-arts merged 1 commit into from
Mar 11, 2025
Merged

fix: make --git work with --branch again #3323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/cli/cli_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ impl PrefixUpdateConfig {
#[derive(Parser, Debug, Default, Clone)]
pub struct GitRev {
/// The git branch
#[clap(long, requires = "git", conflicts_with_all = ["tag", "rev"], group="git_group")]
#[clap(long, requires = "git", conflicts_with_all = ["tag", "rev"])]
pub branch: Option<String>,

/// The git tag
#[clap(long, requires = "git", conflicts_with_all = ["branch", "rev"], group="git_group")]
#[clap(long, requires = "git", conflicts_with_all = ["branch", "rev"])]
pub tag: Option<String>,

/// The git revision
#[clap(long, requires = "git", conflicts_with_all = ["branch", "tag"], group="git_group")]
#[clap(long, requires = "git", conflicts_with_all = ["branch", "tag"])]
pub rev: Option<String>,
}

Expand Down Expand Up @@ -258,15 +258,15 @@ pub struct DependencyConfig {
pub feature: FeatureName,

/// The git url to use when adding a git dependency
#[clap(long, short, group = "git_group")]
#[clap(long, short)]
pub git: Option<Url>,

#[clap(flatten)]
/// The git revisions to use when adding a git dependency
pub rev: Option<GitRev>,

/// The subdirectory of the git repository to use
#[clap(long, short, requires = "git", group = "git_group")]
#[clap(long, short, requires = "git")]
pub subdir: Option<String>,
}

Expand Down
Loading