upleb.uk

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

summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/git/mod.rs5
-rw-r--r--src/lib/git/nostr_url.rs4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs
index 06573eb..b9711ae 100644
--- a/src/lib/git/mod.rs
+++ b/src/lib/git/mod.rs
@@ -459,8 +459,7 @@ impl RepoActions for Repo {
459 }) { 459 }) {
460 None => { 460 None => {
461 bail!(format!( 461 bail!(format!(
462 "{} is not an ancestor of {}", 462 "{latest_commit} is not an ancestor of {base_commit}"
463 latest_commit, base_commit
464 )); 463 ));
465 } 464 }
466 Some(res) => res.context("revwalk failed to reveal commit")?, 465 Some(res) => res.context("revwalk failed to reveal commit")?,
@@ -671,7 +670,7 @@ impl RepoActions for Repo {
671 if !applied_oid.to_string().eq(commit_id) { 670 if !applied_oid.to_string().eq(commit_id) {
672 bail!( 671 bail!(
673 "when applied the patch commit id ({}) doesn't match the one specified in the event tag ({})", 672 "when applied the patch commit id ({}) doesn't match the one specified in the event tag ({})",
674 applied_oid.to_string(), 673 applied_oid,
675 get_commit_id_from_patch(patch)?, 674 get_commit_id_from_patch(patch)?,
676 ); 675 );
677 } 676 }
diff --git a/src/lib/git/nostr_url.rs b/src/lib/git/nostr_url.rs
index 0a8338a..23c98e7 100644
--- a/src/lib/git/nostr_url.rs
+++ b/src/lib/git/nostr_url.rs
@@ -543,7 +543,7 @@ pub fn convert_clone_url_to_https(url: &str) -> Result<String> {
543 // Construct the HTTPS URL 543 // Construct the HTTPS URL
544 return Ok(format!("https://{}/{}", parts[0], parts[1..].join("/"))); 544 return Ok(format!("https://{}/{}", parts[0], parts[1..].join("/")));
545 } 545 }
546 bail!("Invalid SSH URL format: {}", url); 546 bail!("Invalid SSH URL format: {url}");
547 } 547 }
548 // Convert ftp:// to https:// 548 // Convert ftp:// to https://
549 else if stripped_url.starts_with("ftp://") { 549 else if stripped_url.starts_with("ftp://") {
@@ -555,7 +555,7 @@ pub fn convert_clone_url_to_https(url: &str) -> Result<String> {
555 } 555 }
556 556
557 // If the URL is neither HTTPS, SSH, nor git@, return an error 557 // If the URL is neither HTTPS, SSH, nor git@, return an error
558 bail!("Unsupported URL protocol: {}", url); 558 bail!("Unsupported URL protocol: {url}");
559} 559}
560 560
561// Function to strip username and password from the URL 561// Function to strip username and password from the URL