improvements to gix clean
#1470
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
EliahKagan
approved these changes
Jul 26, 2024
There was a problem hiding this comment.
This is great! It even properly handles the intuitively tricky case where the repo has a git worktree managed worktree that is nested inside an unrelated repository that is itself nested inside an ignored directory. The directory for the unrelated repository is removed, except for its subdirectory that is our worktree.
ek@Glub:~/src/has-deeply-nested-worktree (main)$ git worktree list
/home/ek/src/has-deeply-nested-worktree e53b380 [main]
/home/ek/src/has-deeply-nested-worktree/subdir/blah/tricky e53b380 [tricky]
/home/ek/src/has-deeply-nested-worktree/subdir/mybranch e53b380 [mybranch]
ek@Glub:~/src/has-deeply-nested-worktree (main)$ tree
.
└── subdir
├── blah
│ ├── bar
│ ├── foo
│ └── tricky
└── mybranch
4 directories, 2 files
ek@Glub:~/src/has-deeply-nested-worktree (main)$ gix clean -xdrn
WOULD remove repository subdir/blah/.git/ (🗑️)
WOULD remove subdir/blah/bar (🗑️)
WOULD remove subdir/blah/foo (🗑️)
ek@Glub:~/src/has-deeply-nested-worktree (main)$ git worktree remove subdir/mybranch
ek@Glub:~/src/has-deeply-nested-worktree (main)$ git worktree list
/home/ek/src/has-deeply-nested-worktree e53b380 [main]
/home/ek/src/has-deeply-nested-worktree/subdir/blah/tricky e53b380 [tricky]
ek@Glub:~/src/has-deeply-nested-worktree (main)$ gix clean -xdrn
WOULD remove repository subdir/blah/.git/ (🗑️)
WOULD remove subdir/blah/bar (🗑️)
WOULD remove subdir/blah/foo (🗑️)
ek@Glub:~/src/has-deeply-nested-worktree (main)$ gix clean -xdre
removing repository subdir/blah/.git/ (🗑️)
removing subdir/blah/bar (🗑️)
removing subdir/blah/foo (🗑️)
ek@Glub:~/src/has-deeply-nested-worktree (main)$ tree
.
└── subdir
└── blah
└── tricky
3 directories, 0 files
ek@Glub:~/src/has-deeply-nested-worktree (main)$ ls -al subdir/blah
total 12
drwxr-xr-x 3 ek ek 4096 Jul 26 04:59 .
drwxr-xr-x 3 ek ek 4096 Jul 26 04:58 ..
drwxr-xr-x 2 ek ek 4096 Jul 26 04:55 tricky
|
Are there aspects of #1469 that this does not cover? It looks like this may be a fix for it rather than just being related. But maybe I'm missing something. |
|
Indeed, it turned out to be a fix. |
EliahKagan
added a commit
to EliahKagan/gitoxide
that referenced
this pull request
Jul 26, 2024
Since GitoxideLabs#1470 (for GitoxideLabs#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.
EliahKagan
added a commit
to EliahKagan/gitoxide
that referenced
this pull request
Jul 26, 2024
Since GitoxideLabs#1470 (for GitoxideLabs#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.
EliahKagan
added a commit
to EliahKagan/gitoxide
that referenced
this pull request
Jul 26, 2024
Since GitoxideLabs#1470 (for GitoxideLabs#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.
LuaKT
pushed a commit
to LMonitor/gitoxide
that referenced
this pull request
Aug 20, 2024
LuaKT
pushed a commit
to LMonitor/gitoxide
that referenced
this pull request
Aug 20, 2024
Since GitoxideLabs#1470 (for GitoxideLabs#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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RelatedFixes #1469Tasks