Skip to content

Commit fcebc44

Browse files
committed
fix: Adjust gix clean warning and help for worktree fix
Since #1470 (for #1469), the repository's own nested worktrees are no longer removed when using `gix clean`, even if they are nested arbitarily under ignored directories. So no new mention of worktrees (separate from "repositories") in the help and warning message is accurate or required. This removes that, which means really we are keeping the warning message the same as it had been earlier, while still otherwise bringing in new explanatory text in the `gix clean` options help.
1 parent a32dcc2 commit fcebc44

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

gitoxide-core/src/repository/clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ pub(crate) mod function {
325325
wrote_nl = true;
326326
writeln!(
327327
err,
328-
"WARNING: would remove repositories and worktrees hidden inside ignored directories - use --skip-hidden-repositories to skip{}",
328+
"WARNING: would remove repositories hidden inside ignored directories - use --skip-hidden-repositories to skip{}",
329329
wrap_in_parens(msg.take().unwrap_or_default())
330330
)?;
331331
}

src/plumbing/options/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -592,10 +592,10 @@ pub mod clean {
592592
/// in reasonable, but often unexpected ways.
593593
#[arg(long, short = 'm')]
594594
pub pathspec_matches_result: bool,
595-
/// Enter ignored directories to skip repositories (and worktrees) contained within.
595+
/// Enter ignored directories to skip repositories contained within.
596596
///
597-
/// This identifies and avoids deleting any unrelated repositories, or alternate worktrees
598-
/// of this repository, that are nested inside ignored directories eligible for removal.
597+
/// This identifies and avoids deleting separate repositories that are nested inside
598+
/// ignored directories eligible for removal.
599599
#[arg(long)]
600600
pub skip_hidden_repositories: Option<FindRepository>,
601601
/// What kind of repositories to find inside of untracked directories.

0 commit comments

Comments
 (0)