Skip to content

Add timeout to remote git operation (push and pull) #162

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

Merged
wiiznokes merged 2 commits into from
Jan 5, 2026
Merged

Add timeout to remote git operation (push and pull) #162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6611dd
Update mod.rs
wiiznokes Jan 4, 2026
6789afb
Update mod.rs
wiiznokes Jan 5, 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
13 changes: 13 additions & 0 deletions app/src/main/rust/src/libgit2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,17 @@ pub fn init_lib(home_path: String) {
error!("gitconfig: {e}");
}
}

unsafe {
libgit2_sys::git_libgit2_opts(
libgit2_sys::GIT_OPT_SET_SERVER_CONNECT_TIMEOUT as std::ffi::c_int,
7000,
);
libgit2_sys::git_libgit2_opts(
libgit2_sys::GIT_OPT_SET_SERVER_TIMEOUT as std::ffi::c_int,
7000,
);
};
}

pub fn create_repo(repo_path: &str) -> Result<(), Error> {
Expand Down Expand Up @@ -241,6 +252,7 @@ pub fn commit_all(name: &str, email: &str, message: &str) -> Result<(), Error> {

pub fn push(cred: Option<Cred>) -> Result<(), Error> {
apply_ssh_workaround(false);

let repo = REPO.lock().expect("repo lock");
let repo = repo.as_ref().expect("repo");

Expand Down Expand Up @@ -272,6 +284,7 @@ pub fn push(cred: Option<Cred>) -> Result<(), Error> {

pub fn pull(cred: Option<Cred>, author: &GitAuthor) -> Result<(), Error> {
apply_ssh_workaround(false);

let repo = REPO.lock().expect("repo lock");
let repo = repo.as_ref().expect("repo");

Expand Down