From 129e5abb54cb6bf3c5494ac4d9b3519182727336 Mon Sep 17 00:00:00 2001 From: "andy.boot" Date: Thu, 8 Jan 2026 22:20:42 +0000 Subject: [PATCH 1/3] build: attempt to add deb-latest to build --- .github/workflows/CICD.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index d8407162..fd9b4bc3 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -129,7 +129,6 @@ jobs: - { os: deb-latest, target: x86_64-unknown-linux-musl, - use-cross: use-cross, } - { os: macos-latest, target: x86_64-apple-darwin } - { os: windows-latest, target: i686-pc-windows-gnu } From 7a57cb97d759ed27277b852dca1551a5383bb8d4 Mon Sep 17 00:00:00 2001 From: "andy.boot" Date: Thu, 8 Jan 2026 22:41:23 +0000 Subject: [PATCH 2/3] Revert "build: attempt to add deb-latest to build" This reverts commit 129e5abb54cb6bf3c5494ac4d9b3519182727336. --- .github/workflows/CICD.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index fd9b4bc3..d8407162 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -129,6 +129,7 @@ jobs: - { os: deb-latest, target: x86_64-unknown-linux-musl, + use-cross: use-cross, } - { os: macos-latest, target: x86_64-apple-darwin } - { os: windows-latest, target: i686-pc-windows-gnu } From bdd85b9bf4e04c136cd1658b1210c1adf7d917cc Mon Sep 17 00:00:00 2001 From: "andy.boot" Date: Thu, 8 Jan 2026 22:41:34 +0000 Subject: [PATCH 3/3] Revert "build: Attempt to add deb musl build." This reverts commit 07be4261b9b077dc0eee4650c634954e801ed955. --- config/config.toml | 3 --- src/config.rs | 9 --------- src/main.rs | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/config/config.toml b/config/config.toml index 9b43aa67..b3b0fa6c 100644 --- a/config/config.toml +++ b/config/config.toml @@ -28,6 +28,3 @@ ignore-hidden=true output-format="si" number-of-lines=5 - -# To keep the .git directory collapsed -collapse=[".git"] diff --git a/src/config.rs b/src/config.rs index 141500e3..66193311 100644 --- a/src/config.rs +++ b/src/config.rs @@ -38,7 +38,6 @@ pub struct Config { pub files0_from: Option, pub number_of_lines: Option, pub files_from: Option, - pub collapse: Option>, } impl Config { @@ -178,14 +177,6 @@ impl Config { pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> { get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds()) } - - pub fn get_collapse(&self, options: &Cli) -> Option> { - if self.collapse.is_none() { - options.collapse.clone() - } else { - self.collapse.clone() - } - } } fn get_current_date_epoch_seconds() -> i64 { diff --git a/src/main.rs b/src/main.rs index b9c75937..5e80681b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -224,7 +224,7 @@ fn main() { indicator.spawn(output_format.clone()) } - let keep_collapsed: HashSet = match config.get_collapse(&options) { + let keep_collapsed: HashSet = match options.collapse { Some(ref collapse) => { let mut combined_dirs = HashSet::new(); for collapse_dir in collapse {