Skip to content

Sparse: a stop's materialize can delete the user's copy of an out-of-view file the old tree already tracks #256

Closed

Description

@tonibergholm-codento

Found reviewing #251 (fix for #248); predates it, reproduced by the reviewer. On a sparse checkout, a merge/pick/rebase stop's materialize can remove or overwrite the user's local copy of an out-of-view path the old tree already tracks (the untracked-file guard deliberately skips paths the old tree tracks). Needs: refuse (or preserve) when the on-disk copy differs from the tracked content, instead of deleting it; tests for merge, pick, rebase and abort. Related to the abort-delete issue filed from #252.

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