Skip to content

merge/pick/rebase --abort fails with IsADirectory when the decided root replaced a file with a directory #247

Closed

Description

@tonibergholm-codento

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.

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions