Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 08:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore default for showUntrackedFiles (#2751)

Browse source 
This restores the behaviour of `gitui` <= 0.27.
This commit is contained in:
Christoph Rüßler 2025-10-28 15:59:03 +01:00 committed by GitHub
parent db211e5ac7
commit dd475801ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
asyncgit/src/sync/status.rs
View file

@ -177,11 +177,23 @@ pub fn get_status(
let repo: gix::Repository = gix_repo(repo_path)?;
let mut status = repo.status(gix::progress::Discard)?;
let show_untracked = if let Some(config) = show_untracked {
config
} else {
let git2_repo = crate::sync::repository::repo(repo_path)?;
if let Some(config) = show_untracked {
status = status.untracked_files(config.into());
}
// Calling `untracked_files_config_repo` ensures compatibility with `gitui` <= 0.27.
// `untracked_files_config_repo` defaults to `All` while both `libgit2` and `gix` default to
// `Normal`. According to [show-untracked-files], `normal` is the default value that `git`
// chooses.
//
// [show-untracked-files]: https://git-scm.com/docs/git-config#Documentation/git-config.txt-statusshowUntrackedFiles
untracked_files_config_repo(&git2_repo)?
};
let status = repo
.status(gix::progress::Discard)?
.untracked_files(show_untracked.into());
let mut res = Vec::new();