utilities/eza
utilities/eza
1
0
Fork 0
mirror of https://github.com/eza-community/eza synced 2024-09-29 20:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Use GIT_DIR env var to find the repo

Browse source
This commit is contained in:
Christina Sørensen 2023-08-04 05:15:09 +02:00 committed by GitHub
parent 7d54fe5193 a191c6e57b
commit fbd0fdc7de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/fs/feature/git.rs
View file

@ -162,11 +162,25 @@ impl GitRepo {
/// Returns the original buffer if none is found.
fn discover(path: PathBuf) -> Result<Self, PathBuf> {
info!("Searching for Git repository above {:?}", path);
let repo = match git2::Repository::discover(&path) {
// Search with GIT_DIR env variable first if set
let repo = match git2::Repository::open_from_env() {
Ok(r) => r,
Err(e) => {
error!("Error discovering Git repositories: {:?}", e);
return Err(path);
// anything other than NotFound implies GIT_DIR was set and we got actual error
if e.code() != git2::ErrorCode::NotFound {
error!("Error opening Git repo from env using GIT_DIR: {:?}", e);
return Err(path);
} else {
// nothing found, search using discover
match git2::Repository::discover(&path) {
Ok(r) => r,
Err(e) => {
error!("Error discovering Git repositories: {:?}", e);
return Err(path);
}
}
}
}
};