Skip to content

fix: resolve --file paths from any directory in the repo #2927

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
leno23 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: resolve --file paths from any directory in the repo #2927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09604ca
fix: resolve --file paths from any directory in the repo
leno23 May 17, 2026
349a0bf
fix: use env.repo after Environment is constructed
leno23 May 17, 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
28 changes: 20 additions & 8 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,25 @@ impl Environment {
}
}

/// Resolves `--file` to a path relative to the repository workdir (as used by the file tree).
fn resolve_select_file(file: PathBuf, repo: &RepoPath) -> Result<Option<PathBuf>> {
let workdir = PathBuf::from(repo_work_dir(repo)?);
let workdir_canon = workdir.canonicalize()?;

let candidates = [
file.canonicalize().ok(),
workdir.join(&file).canonicalize().ok(),
];

for abs in candidates.into_iter().flatten() {
if let Ok(rel) = abs.strip_prefix(&workdir_canon) {
return Ok(Some(Path::new(".").join(rel)));
}
}

Ok(None)
}

// public interface
impl App {
///
Expand Down Expand Up @@ -178,14 +197,7 @@ impl App {

let mut select_file: Option<PathBuf> = None;
let tab = if let Some(file) = cliargs.select_file {
// convert to relative git path
if let Ok(abs) = file.canonicalize() {
if let Ok(path) = abs.strip_prefix(
env.repo.borrow().gitpath().canonicalize()?,
) {
select_file = Some(Path::new(".").join(path));
}
}
select_file = resolve_select_file(file, &env.repo.borrow())?;
2
} else {
env.options.borrow().current_tab()
Expand Down