diff --git a/src/cmd_args.rs b/src/cmd_args.rs index c007fb8..82debe6 100644 --- a/src/cmd_args.rs +++ b/src/cmd_args.rs @@ -63,15 +63,15 @@ pub(crate) enum Commands { Sync { /// Remote name to sync. remote_name: Option, + /// Use custom git implementation. + #[arg(short, long)] + use_libgit2: bool, /// Whether to use ssh-agent #[arg(long)] use_sshagent: bool, /// Manually specify ssh key #[arg(long)] ssh_key: Option, - /// Use git command. - #[arg(short, long)] - use_cl: bool, }, /// Check config files validity. diff --git a/src/cmd_sync.rs b/src/cmd_sync.rs index 79ce171..b447c3e 100644 --- a/src/cmd_sync.rs +++ b/src/cmd_sync.rs @@ -12,12 +12,12 @@ pub(crate) fn cmd_sync( remote_name: Option, use_sshagent: bool, ssh_key: Option, - use_cl: bool, + use_libgit2: bool, ) -> Result<()> { - if use_cl { - cmd_sync_cl(config_dir, remote_name, ssh_key) - } else { + if use_libgit2 { cmd_sync_custom(config_dir, remote_name, use_sshagent, ssh_key) + } else { + cmd_sync_cl(config_dir, remote_name, ssh_key) } } diff --git a/src/main.rs b/src/main.rs index f8533c1..7c8d47e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -94,10 +94,10 @@ fn main() -> Result<()> { } Commands::Sync { remote_name, + use_libgit2, use_sshagent, ssh_key, - use_cl, - } => cmd_sync::cmd_sync(&config_dir, remote_name, use_sshagent, ssh_key, use_cl)?, + } => cmd_sync::cmd_sync(&config_dir, remote_name, use_sshagent, ssh_key, use_libgit2)?, Commands::Status { path, storage, diff --git a/tests/cli.rs b/tests/cli.rs index 5563ec9..4582915 100644 --- a/tests/cli.rs +++ b/tests/cli.rs @@ -78,14 +78,14 @@ mod integrated_test { Command::cargo_bin("xdbm")? .arg("-c") .arg(config_dir) - .args(["sync", "-vvvv", "-u"]) + .args(["sync", "-vvvv"]) .assert() .success(); } else { Command::cargo_bin("xdbm")? .arg("-c") .arg(config_dir) - .args(["sync", "-vvvv"]) + .args(["sync", "-vvvv", "-u"]) .assert() .success(); } @@ -338,6 +338,7 @@ mod integrated_test { .arg(config_dir_2.path()) .arg("sync") .arg("-vvvv") + .arg("-u") .assert() .success() .stderr(predicate::str::contains("successfully pushed"));