-
Notifications
You must be signed in to change notification settings - Fork 2
Open
Description
Even for a simple PR (such as spack/spack-packages#82) the tool failed to cherry-pick. After re-running the process by hand I found the problem was related to rename detection, and git suggests I set diff.renameLimit to at least 12197.
Doing so allowed my other PRs to be migrated successfully.
Suggest we check diff.renameLimit in check_dependencies and either issue a warning or adjust it.
This was git 2.25.1:
CONFLICT (modify/delete): ... deleted in HEAD and modified in d15ac8a5b46... [...]
/var/spack/repos/builtin/packages/gcc/package.py left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 12197 and retry the command
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels