upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/bin/ngit/sub_commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/ngit/sub_commands')
-rw-r--r--src/bin/ngit/sub_commands/init.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index 827acf8..3fa67ba 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -304,8 +304,8 @@ fn resolve_grasp_servers(
304 identifier: &str, 304 identifier: &str,
305 interactive: bool, 305 interactive: bool,
306) -> Result<Vec<String>> { 306) -> Result<Vec<String>> {
307 if !args.grasp_servers.is_empty() { 307 if !args.grasp_server.is_empty() {
308 return Ok(args.grasp_servers.clone()); 308 return Ok(args.grasp_server.clone());
309 } 309 }
310 310
311 let has_both_relays_and_clone_url = !args.relays.is_empty() && !args.clone.is_empty(); 311 let has_both_relays_and_clone_url = !args.relays.is_empty() && !args.clone.is_empty();
@@ -414,13 +414,13 @@ fn validate_fresh(cli: &Cli, args: &SubCommandArgs, user_has_grasp_list: bool) -
414 missing.push(("--name <NAME>", "repository name or identifier")); 414 missing.push(("--name <NAME>", "repository name or identifier"));
415 } 415 }
416 416
417 let has_grasp_servers = !args.grasp_servers.is_empty(); 417 let has_grasp_servers = !args.grasp_server.is_empty();
418 let has_both_relays_and_clone_url = !args.relays.is_empty() && !args.clone.is_empty(); 418 let has_both_relays_and_clone_url = !args.relays.is_empty() && !args.clone.is_empty();
419 let missing_servers = 419 let missing_servers =
420 !has_grasp_servers && !user_has_grasp_list && !has_both_relays_and_clone_url; 420 !has_grasp_servers && !user_has_grasp_list && !has_both_relays_and_clone_url;
421 if missing_servers { 421 if missing_servers {
422 missing.push(( 422 missing.push((
423 "--grasp-servers <URL>...", 423 "--grasp-server <URL>...",
424 "where your git+nostr data is hosted", 424 "where your git+nostr data is hosted",
425 )); 425 ));
426 } 426 }
@@ -467,7 +467,7 @@ pub struct SubCommandArgs {
467 description: Option<String>, 467 description: Option<String>,
468 #[clap(short, long, value_parser, num_args = 1..)] 468 #[clap(short, long, value_parser, num_args = 1..)]
469 /// where your git+nostr data is hosted 469 /// where your git+nostr data is hosted
470 grasp_servers: Vec<String>, 470 grasp_server: Vec<String>,
471 #[clap(long, value_parser, num_args = 1..)] 471 #[clap(long, value_parser, num_args = 1..)]
472 /// additional relays beyond grasp servers 472 /// additional relays beyond grasp servers
473 relays: Vec<String>, 473 relays: Vec<String>,
@@ -495,7 +495,7 @@ impl SubCommandArgs {
495 || self.description.is_some() 495 || self.description.is_some()
496 || !self.clone.is_empty() 496 || !self.clone.is_empty()
497 || !self.relays.is_empty() 497 || !self.relays.is_empty()
498 || !self.grasp_servers.is_empty() 498 || !self.grasp_server.is_empty()
499 || !self.web.is_empty() 499 || !self.web.is_empty()
500 || !self.blossoms.is_empty() 500 || !self.blossoms.is_empty()
501 || !self.other_maintainers.is_empty() 501 || !self.other_maintainers.is_empty()