Skip to content

gix-clean fixes#1465

Merged
Sebastian Thiel (Byron) merged 5 commits into
mainfrom
fix-clean
Jul 25, 2024
Merged

gix-clean fixes#1465
Sebastian Thiel (Byron) merged 5 commits into
mainfrom
fix-clean

Conversation

@Byron

@Byron Sebastian Thiel (Byron) commented Jul 24, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

Fixes #1464

Tasks

  • handle ignored sub-repos correctly in deletion mode
  • add list of worktree-directories to prevent deleting them.
    • There probably is no need to specifically classify them, as users who want that can always perform their own match later.

@Byron Sebastian Thiel (Byron) mentioned this pull request Jul 25, 2024
Closed
@Byron
feat: support for listing worktrees with gix worktree list
c7213bc
@Byron
feat!: make it possible to consider worktrees to be 'tracked' (#1464)
c9cd2d2 
That way it's possibel for them to be equivalent to submodules, which
would never be deleted by accident due to their 'tracked' status.

This works by passing repository-relative paths of worktree locations
that are within this repository.
@Byron
adapt to changes in gix-dir
37c2852 
This includes an improvement on how `gix` initiates a dirwalk with the purpose
of deletion so that worktrees are protected should the fall into the parent-repository
working directory.
@Byron
Sebastian Thiel (Byron) marked this pull request as ready for review July 25, 2024 15:12
@Jake-Shadle

Jake Shadle (Jake-Shadle) commented Jul 25, 2024

Copy link
Copy Markdown
Contributor

Just want to note that the compile error https://github.com/Byron/gitoxide/actions/runs/10096731569/job/27919945706?pr=1465#step:7:586 also affects downstream users. 😓 https://github.com/EmbarkStudios/cargo-deny/actions/runs/10096375353/job/27918741455?pr=676#step:7:87

@Jake-Shadle

Jake Shadle (Jake-Shadle) commented Jul 25, 2024

Copy link
Copy Markdown
Contributor

I was able to workaround this by specifying --locked with cargo install since I noticed that the test failure in this PR and the one in cargo-deny's both come from cargo install rather than regular builds...but this doesn't actually make sense to me because AFAICT gix-path 0.10.9 and gix-credentials 0.24.3 will are used regardless of whether --locked is specified or not, so I'm a bit perplexed.

@Byron
fix: avoid as_ref() call as bstr could break downstream with new …
1772f88 
…impls (#1466)

As `bstr` adds a new implementation of `AsRef`, the `as_ref()` call becomes
ambiguous which will then break `gitoxide`.

Now `as_ref()` is avoided in favor of a method that can't fail.
@Byron Sebastian Thiel (Byron) mentioned this pull request Jul 25, 2024
Closed
@Byron

Sebastian Thiel (Byron) commented Jul 25, 2024

Copy link
Copy Markdown
Member Author

Jake Shadle (@Jake-Shadle) The relevant issue is #1466 with all the details. A fix is on the way, which is done in collaboration with bstr which kindly yanked the most recent version until gitoxide can respond.

@Byron
Sebastian Thiel (Byron) merged commit 33eacfb into main Jul 25, 2024
@Byron
Sebastian Thiel (Byron) deleted the fix-clean branch July 25, 2024 18:13
@EliahKagan Eliah Kagan (EliahKagan) mentioned this pull request Jul 26, 2024
Closed
@EliahKagan Eliah Kagan (EliahKagan) mentioned this pull request Oct 29, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

gix clean with -r or -xd deletes the repo's own nested worktrees

2 participants

@Byron @Jake-Shadle