Repository navigation
fix: 修复工作树时不再拒绝本仓库另一个有效的工作树 - #85
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
修复工作树的对话框不再拒绝本仓库另一个有效的工作树:它的
.git文件同样指回这个仓库,按23-M23-服务器仓库挂载到本机.md的 “失效的工作树”,只有选中的文件夹不是这个仓库的工作树目录时才报错。承接 #84。改动
worktree.repair.alreadyUseddocs/testing/M23.md:自动测试的说明与 “失效的工作树” 的手动步骤补上这一项验证
mise run swift:lint、mise run build、swift build --product Spooky、./scripts/build-app.sh、mise run bundle与codesign --verify --deep --strict build/Spooky.app通过mise run test:474 + 349 + 9 = 832 个通过,需要服务器或 github.com 的测试按默认跳过;第一次全量时AppIconControllerTests的一个用例偶发抛出AppIconWriteError,单独连跑 3 次与全量重跑都通过RepositoryWorktreesTests的 “修复前核对选中的目录” 在临时仓库里经validateRepair与repair(at:)核对:另一个有效的工作树通过核对;修复后它在git worktree list里的一行、.git文件、工作区文件与仓库里的gitdir登记都不变,失效的工作树仍然失效git worktree list --porcelain前后相同,那个有效工作树的.git与登记不变未验证