Skip to content

fix(revlog): log fetch errors instead of aborting the process #3019

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
MsfPablo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(revlog): log fetch errors instead of aborting the process #3019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions asyncgit/src/revlog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,25 @@ impl AsyncLog {
rayon_core::spawn(move || {
scope_time!("async::revlog");

Self::fetch_helper(
if let Err(e) = Self::fetch_helper(
&repo_path,
&arc_current,
&arc_background,
&sender,
filter,
)
.expect("failed to fetch");
) {
// The log walker runs on a rayon worker thread. A
// panic here aborts the whole process (rayon panics
// are unwound, then re-aborted). The most reachable
// trigger is the unfiltered Log tab when the process
// cwd has been deleted (e.g. stashing untracked files
// from inside the now-removed subdirectory), where
// `gix` discovery reads the cwd unconditionally and
// fails with `CurrentDir(NotFound)`. Log the fetch
// error and degrade the tab instead of aborting, in
// line with `asyncgit::status`, `blame` and `diff`.
log::error!("fetch_helper revlog: {e}");
}

arc_pending.store(false, Ordering::Relaxed);

Expand Down