You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
merge/pick/rebase --abort fails with IsADirectory when the decided root replaced a file with a directory #247
Raised by Codex on #236 and declined there because it is not specific to the sparse widen: any --abort of a stopped merge/cherry-pick/rebase where the other side replaced a file with a directory (or the reverse) can fail in materialize with IsADirectory when restoring the original tip over the stop's working-tree layout. Needs its own fix in worktree::materialize (remove the obstructing file/dir the stop laid before writing the restored entry) plus abort tests for file->dir and dir->file transitions on merge, pick and rebase.
Activity
fix(repo): address review on #247: private switch, sidecar dirs, no p…
fix(repo): remove obstructing directories bottom-up, never recursively
fix(repo): do not follow swapped entries or non-UTF-8 names when clea…
fix(repo): refuse a blocked abort before any write (#247)
fix(repo): keep a user's empty directory when materializing with no o…
fix(repo): merge main; out-of-view guard refuses any directory (#247, #…
fix(repo): clear emptied directories so abort and switch can restore …
fix(repo,vfs): refuse a snapshot that holds a file and a directory at…