Skip to content

chore(deps): update rust crate git2 to 0.21.0 #1921

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

Open
renovate wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore(deps): update rust crate git2 to 0.21.0 #1921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4be08e
chore(deps): update rust crate git2 to 0.21.0
renovate[bot] May 25, 2026
880fcc0
fix git2 0.21 transport features and api changes
Copilot May 25, 2026
3d33927
drop unnecessary git2 transport features
Copilot Jun 3, 2026
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
5 changes: 2 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/knope/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ deno_path_util = "0.6.1"
deno_semver = { workspace = true }
dirs = "6.0.0"
execute = "0.2.13"
git2 = { version = "0.20.0", default-features = false }
git2 = { version = "0.21.0", default-features = false }
glob = "0.3.1"
indexmap = { workspace = true }
inquire = { version = "0.9.0", default-features = false, features = [
Expand Down
17 changes: 10 additions & 7 deletions crates/knope/src/integrations/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,18 +180,21 @@ pub(crate) fn select_issue_from_current_branch(
pub(crate) fn current_branch() -> Result<String, Error> {
let repo = Repository::open(".").map_err(ErrorKind::OpenRepo)?;
let head = repo.head()?;
let ref_name = head.name().ok_or(ErrorKind::NotOnAGitBranch)?;
if !head.is_branch() {
return Err(ErrorKind::NotOnAGitBranch.into());
}
let ref_name = head.name()?;
Ok(ref_name.to_owned())
}

/// Get the first remote of the Git repo, if any.
pub(crate) fn get_first_remote() -> Option<String> {
let repo = Repository::open(".").ok()?;
let remotes = repo.remotes().ok()?;
let remote_name = remotes.get(0)?;
let remote_name = remotes.get(0).ok()??;
repo.find_remote(remote_name)
.ok()
.and_then(|remote| remote.url().map(String::from))
.and_then(|remote| remote.url().ok().map(String::from))
}

fn select_issue_from_branch_name(ref_name: &str) -> Result<Issue, Error> {
Expand Down Expand Up @@ -304,7 +307,7 @@ fn switch_to_branch(repo: &Repository, branch: &Branch) -> Result<(), Error> {
let ref_name = branch
.get()
.name()
.ok_or(Error::from(ErrorKind::BadGitBranchName))?;
.map_err(|_| Error::from(ErrorKind::BadGitBranchName))?;
repo.set_head(ref_name)?;
repo.checkout_head(Some(CheckoutBuilder::new().force()))
.map_err(ErrorKind::IncompleteCheckout)?;
Expand Down Expand Up @@ -406,7 +409,7 @@ pub(crate) fn get_commit_messages_after_tag(tag: Option<&str>) -> Result<Vec<Com
for oid in revwalk.filter_map(Result::ok) {
if !commits_to_exclude.contains(&oid) {
if let Ok(commit) = repo.find_commit(oid) {
if let Some(message) = commit.message().map(String::from) {
if let Ok(message) = commit.message().map(String::from) {
commits.push(Commit {
message,
info: commit_info(&commit),
Expand All @@ -424,7 +427,7 @@ pub(crate) fn get_commit_messages_after_tag(tag: Option<&str>) -> Result<Vec<Com

fn commit_info(commit: &git2::Commit) -> Option<GitInfo> {
Some(GitInfo {
author_name: commit.author().name().map(String::from)?,
author_name: commit.author().name().ok().map(String::from)?,
hash: commit.id().to_string().get(..7).map(String::from)?,
pr_number: None,
pr_author_login: None,
Expand Down Expand Up @@ -465,7 +468,7 @@ pub(crate) fn all_tags_on_branch() -> Result<Vec<String>, Error> {
let repo = Repository::open(current_dir().map_err(ErrorKind::CurrentDirectory)?)?;
let mut all_tags: HashMap<Oid, Vec<String>> = HashMap::new();
for reference in repo.references()?.filter_map(Result::ok) {
let Some(name) = reference.name() else {
let Ok(name) = reference.name() else {
continue;
};
if !name.starts_with("refs/tags/") {
Expand Down