git - git bisect with additional patch

Question

Let's say I have these revisions:

• rev 1 introduces bug #1
• rev 2 possibly introduces bug #2
• rev 3 possibly introduces bug #2
• rev 4 possibly introduces bug #2
• rev 5 fixes bug #1

To verify where bug #2 occured, bug #1 needs to be fixed.

Can the revision where bug #2 first occured be determined during a single git bisect run, possibly through manually appling the rev 5 patch on each bisect step? Would manually patching interfere a bisect?

Answer 1

在实际阅读文档之后，这样的事情可能会起作用（每个平分步骤）：

git cherry-pick [patch-rev]
git reset --hard
git bisect [good/bad]

Answer 2

当您到达需要热修复补丁的区域（您的 ex. 中的第 5 版）时，只需运行：

git cherry-pick --no-commit hot-fix 

然后继续正常平分。