Use git2 v0.18

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "git-del-branches"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Nguyễn Hồng Quân <[email protected]>"]
 license = "GPL-3.0-or-later"
 edition = "2021"
@@ -19,6 +19,6 @@ color-eyre = "0.6.2"
 console = { version = "0.15.7", features = ["windows-console-colors"] }
 eyre = "0.6.8"
 format-bytes = "0.3.0"
-git2 = "0.17.2"
-git2_credentials = "0.12.0"
+git2 = "0.18.1"
+git2_credentials = "0.13.0"
 inquire = "0.6.2"

src/main.rs

@@ -124,16 +124,22 @@ fn main() -> Result<()> {
     let git_config = git2::Config::open_default()?;
     let mut credential_handler = CredentialHandler::new(git_config);
     remote_callback.credentials(move |url, username, allowed| {
+        let msg = if let Some(name) = username {
+            format!("Try authenticating with \"{}\" username for {}...", name, url)
+        } else {
+            format!("Try authenticating for {}, without username...", url)
+        };
+        eprintln!("  {}", style(msg).dim());
         credential_handler.try_next_credential(url, username, allowed)
     });
     let mut origin = repo.find_remote("origin").ok();
     let mut opts = PushOptions::new();
     opts.remote_callbacks(remote_callback);
     for (mut lb, rb) in branch_pairs {
         lb.delete().ok();
-        if rb.is_some() && origin.is_some() {
-            delete_upstream_branch(rb.unwrap(), &mut origin.as_mut().unwrap(), &mut opts);
-        }
+        if let Some((orig, branch)) = origin.as_mut().zip(rb) {
+            delete_upstream_branch(branch, orig, &mut opts);
+        };
     }
     eprintln!("{} {}", Emoji("🎉", "v"), style("Done!").bright().green());
     Ok(())