ILD

git cherry-pick耗时太久的问题
作者:Yuan Jianpeng 邮箱:yuanjp89@163.com
发布时间:2023-10-24 站点:Inside Linux Development

git cherry-pick的时候,卡住很久:


$ git cp 660ab1c58d92fab92463814212819ba59836e493

Auto-merging package/isp/isp-dp/src/aos/aos.c

warning: inexact rename detection was skipped due to too many files.

warning: you may want to set your merge.renamelimit variable to at least 380089 and retry the command.

On branch CR881X-release

Your branch is up to date with 'origin/CR881X-release'.


You are currently cherry-picking commit 660ab1c58d.

  (all conflicts fixed: run "git cherry-pick --continue")

  (use "git cherry-pick --skip" to skip this patch)

  (use "git cherry-pick --abort" to cancel the cherry-pick operation)


nothing to commit, working tree clean

The previous cherry-pick is now empty, possibly due to conflict resolution.

If you wish to commit it anyway, use:


    git commit --allow-empty


Otherwise, please use 'git cherry-pick --skip'



原因是执行重命名检测耗时太久,可以修改重命名限制

$ git config --global merge.renamelimit 100


Copyright © linuxdev.cc 2017-2024. Some Rights Reserved.